From: wtgodbe <wigodbe@microsoft.com>
Date: Wed, 22 Feb 2017 20:35:27 +0000 (-0800)
Subject: Pick up new CoreFX packages and abandon old ones
X-Git-Tag: submit/tizen/20210909.063632~11030^2~7743^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b843687b2540c55d141e6a1d9b60c86867efad08;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Pick up new CoreFX packages and abandon old ones


Commit migrated from https://github.com/dotnet/coreclr/commit/5fc26e331934ea3e920103de8cb4161d2ff0ba6e
---

diff --git a/src/coreclr/Tools-Override/depProj.targets b/src/coreclr/Tools-Override/depProj.targets
new file mode 100644
index 0000000..ea32123
--- /dev/null
+++ b/src/coreclr/Tools-Override/depProj.targets
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+***********************************************************************************************
+depProj.targets
+
+WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
+          created a backup copy.  Incorrect changes to this file will make it
+          impossible to load or build your projects from the command-line or the IDE.
+
+This file defines the steps in the standard build process specific for NuGet deployment
+projects. The remainder of the build process is defined in Microsoft.Common.targets, 
+which is imported by this file.
+
+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.
+***********************************************************************************************
+-->
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+  <!-- Deployment project
+       Restores NuGet dependencies and copies them to the output directory.
+       
+       NuGetTargetMoniker - determined by the TargetFramework* and TargetPlatform* 
+                            properties of the project, can be overidden.
+       NuGetRuntimeIdentifier - defaults to <empty> (""), can be overidden.
+       NuGetDeploySourceItem - defaults to ReferenceCopyLocalPaths, can be overidden to
+                               specify Reference (for compile assets) or Analyzer(for
+                               analyzer assets)
+                         
+       For the appropriate behavior of P2P references the project should set the 
+       TargetName and TargetExt to match one of the files that will be copied
+       from the packages.
+  -->
+
+  <PropertyGroup>
+    <NuGetDeploySourceItem Condition="'$(NuGetDeploySourceItem)' == ''">ReferenceCopyLocalPaths</NuGetDeploySourceItem>
+
+    <!-- suppress the attempt to copy build output. -->
+    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
+
+    <!-- Unless overridden, use no runtime identifier. This is transformed in packageresolve.targets. 
+         We specify "None" here to avoid being assigned the default runtime for projects which set CopyNuGetImplementations=true. -->
+    <NuGetRuntimeIdentifier Condition="'$(NuGetRuntimeIdentifier)' == ''">None</NuGetRuntimeIdentifier>
+
+    <!-- make sure we tell nuget targets to copy, even if output type would not by default -->
+    <CopyNuGetImplementations>true</CopyNuGetImplementations>
+
+    <!-- by default there shouldn't be any assets in depproj files that require signing -->
+    <SkipSigning Condition="'$(SkipSigning)' == ''">true</SkipSigning>
+  </PropertyGroup>
+
+  <Target Name="CoreCompile">
+
+    <Error Condition="'$(NuGetDeploySourceItem)' != 'ReferenceCopyLocalPaths' AND
+                      '$(NuGetDeploySourceItem)' != 'Reference' AND
+                      '$(NuGetDeploySourceItem)' != 'Analyzer'"
+           Text="Unexpected value for NuGetDeploySourceItem:'$(NuGetDeploySourceItem)'.  Expected ReferenceCopyLocalPaths, Reference, or Analyzer." />
+
+    <ItemGroup>
+      <!-- Don't set IntermediateAssembly since this is not produced -->
+      <IntermediateAssembly Remove="@(IntermediateAssembly)" />
+
+      <NuGetDeploy Include="@($(NuGetDeploySourceItem))"/>
+
+      <!-- filter to only items that came from packages -->
+      <!-- the following condition must be applied after the include because msbuild doesn't seem
+           to support property-defined-item-names in a metadata statement -->
+      <NuGetDeploy Remove="@(NuGetDeploy)" Condition="'%(NuGetDeploy.NuGetPackageId)' == ''" />
+
+      <!-- remove all existing items from NuGet packages we'll be defining these in our own item -->
+      <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != ''"/>
+      <Reference Remove="@(Reference)" Condition="'%(Reference.NuGetPackageId)' != ''"/>
+      <Analyzer Remove="@(Analyzer)" Condition="'%(Analyzer.NuGetPackageId)' != ''"/>
+
+      <!-- add items defined by NuGetDeployItem property to Content so that we get clean behavior -->
+      <ContentWithTargetPath Include="@(NuGetDeploy)">
+        <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+        <TargetPath>%(FileName)%(Extension)</TargetPath>
+      </ContentWithTargetPath>
+    </ItemGroup>
+
+    <Error Condition="'@(NuGetDeploy)' == ''" Text="Error no assets were resolved from NuGet packages." />
+    <Message Importance="High" Text="%(FullPath) (%(NuGetPackageId).%(NuGetPackageVersion)) -&gt; @(NuGetDeploy->'$(TargetDir)%(FileName)%(Extension)')" />
+
+    <!-- Include marker files if an extension has been provided -->
+    <!-- internal builds use this to distinguish files which have already been signed -->
+    <Touch Condition="'$(DeployMarkerExtension)' != ''" Files="@(NuGetDeploy->'$(TargetDir)%(FileName)$(DeployMarkerExtension)')" AlwaysCreate="true">
+      <Output TaskParameter="TouchedFiles" ItemName="FileWrites"/>
+    </Touch>
+  </Target>
+
+  <Import Project="$(MSBuildToolsPath)\Microsoft.Common.targets" />
+
+  <!-- Required by Common.Targets but not used for depproj -->
+  <Target Name="CreateManifestResourceNames" />
+
+  <PropertyGroup>
+    <!-- don't use TargetingPackReference, we do our own filtering -->
+    <SkipFilterTargetingPackResolvedNugetPackages>true</SkipFilterTargetingPackResolvedNugetPackages>
+  </PropertyGroup>
+  
+  <!-- Support filtering to a subset of packages or files -->
+  <Target Name="FilterNugetPackages" 
+          AfterTargets="ResolveNuGetPackages"
+          Condition="'@(PackageToInclude)' != '' OR '@(PackageToExclude)' != '' OR '@(FileToInclude)' != '' OR '@(FileToExclude)' != ''">
+    <ItemGroup>
+      <_nuGetDeploy Include="@($(NuGetDeploySourceItem))"/>
+      <_nuGetDeployByFileName Include="@(_nuGetDeploy->'%(FileName)')">
+        <OriginalItemSpec>%(Identity)</OriginalItemSpec>
+      </_nuGetDeployByFileName>
+
+      <_nuGetDeployByFileNameToRemove Include="@(_nuGetDeployByFileName)" Exclude="@(FileToInclude)" Condition="'@(FileToInclude)' != ''" />
+      <_filteredNuGetDeployByFileName Include="@(_nuGetDeployByFileName)" Exclude="@(_nuGetDeployByFileNameToRemove);@(FileToExclude)" />
+      
+      <_nuGetDeployByPackageId Include="@(_filteredNuGetDeployByFileName->'%(NuGetPackageId)')" />
+
+      <_nuGetDeployByPackageIdToRemove Include="@(_nuGetDeployByPackageId)" Exclude="@(PackageToInclude)" Condition="'@(PackageToInclude)' != ''" />
+      <_filteredNuGetDeployByPackageId Include="@(_nuGetDeployByPackageId)" Exclude="@(_nuGetDeployByPackageIdToRemove);@(PackageToExclude)" />
+
+      <ReferenceCopyLocalPaths Condition="'$(NuGetDeploySourceItem)' == 'ReferenceCopyLocalPaths'" Remove="@(ReferenceCopyLocalPaths)" />
+      <Reference Condition="'$(NuGetDeploySourceItem)' == 'Reference'" Remove="@(Reference)" />
+      <Analyzer Condition="'$(NuGetDeploySourceItem)' == 'Analyzer'" Remove="@(Analyzer)" />
+    </ItemGroup>
+    
+    <CreateItem Include="@(_filteredNuGetDeployByPackageId->'%(OriginalItemSpec)')">
+      <Output TaskParameter="Include" ItemName="$(NuGetDeploySourceItem)" />
+    </CreateItem>
+  </Target>
+
+</Project>
diff --git a/src/coreclr/build-test.cmd b/src/coreclr/build-test.cmd
index 7c91b62..4744e491 100644
--- a/src/coreclr/build-test.cmd
+++ b/src/coreclr/build-test.cmd
@@ -317,7 +317,7 @@ set __BuildLogRootName=Tests_XunitWrapper
 set __BuildLog=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.log
 set __BuildWrn=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.wrn
 set __BuildErr=%__LogsDir%\%__BuildLogRootName%_%__BuildOS%__%__BuildArch%__%__BuildType%.err
-set __msbuildLog=/flp:Verbosity=diag;LogFile="%__BuildLog%"
+set __msbuildLog=/flp:Verbosity=normal;LogFile="%__BuildLog%"
 set __msbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%"
 set __msbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%"
 
diff --git a/src/coreclr/run.cmd b/src/coreclr/run.cmd
index 450927b..5327df4 100644
--- a/src/coreclr/run.cmd
+++ b/src/coreclr/run.cmd
@@ -48,6 +48,9 @@ if NOT [%ERRORLEVEL%]==[0] (
   exit /b 1
 )
 
+:: Always copy over the Tools-Override
+xcopy %~dp0Tools-Override\* %~dp0Tools /y >nul
+
 set _toolRuntime=%~dp0Tools
 set _dotnet=%_toolRuntime%\dotnetcli\dotnet.exe
 
diff --git a/src/coreclr/run.sh b/src/coreclr/run.sh
index bd6a68f..9f23901 100755
--- a/src/coreclr/run.sh
+++ b/src/coreclr/run.sh
@@ -5,6 +5,9 @@ working_tree_root="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 echo "Running init-tools.sh"
 $working_tree_root/init-tools.sh
 
+# Always copy over the Tools-Override
+cp $__scriptpath/Tools-Override/* $__scriptpath/Tools > /dev/null
+
 toolRuntime=$working_tree_root/Tools
 dotnet=$toolRuntime/dotnetcli/dotnet
 
diff --git a/src/coreclr/tests/build.proj b/src/coreclr/tests/build.proj
index 63db903..89fca1e 100644
--- a/src/coreclr/tests/build.proj
+++ b/src/coreclr/tests/build.proj
@@ -15,10 +15,16 @@
   <PropertyGroup>
     <TraversalBuildDependsOn>
       BatchRestorePackages;
+      BuildTargetingPack;
       $(TraversalBuildDependsOn);
     </TraversalBuildDependsOn>
   </PropertyGroup>
-  
+
+  <Target Name="BuildTargetingPack" DependsOnTargets="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/src/coreclr/tests/dir.props b/src/coreclr/tests/dir.props
index f4187f4..3a9b043 100644
--- a/src/coreclr/tests/dir.props
+++ b/src/coreclr/tests/dir.props
@@ -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/src/coreclr/tests/publishdependency.targets b/src/coreclr/tests/publishdependency.targets
index f9b1321..d537aec 100644
--- a/src/coreclr/tests/publishdependency.targets
+++ b/src/coreclr/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
diff --git a/src/coreclr/tests/src/Common/build_against_pkg_dependencies/project.json b/src/coreclr/tests/src/Common/build_against_pkg_dependencies/project.json
index a252e31..f93557d 100644
--- a/src/coreclr/tests/src/Common/build_against_pkg_dependencies/project.json
+++ b/src/coreclr/tests/src/Common/build_against_pkg_dependencies/project.json
@@ -7,7 +7,7 @@
     "Microsoft.NETCore.TestHost": "2.0.0-beta-25113-01"
   },
   "frameworks": {
-    "netcoreapp1.1": {
+    "netcoreapp2.0": {
       "imports": [
         "dnxcore50",
         "portable-net45+win8"
diff --git a/src/coreclr/tests/src/Common/external/external.csproj b/src/coreclr/tests/src/Common/external/external.csproj
new file mode 100644
index 0000000..f7fa75e
--- /dev/null
+++ b/src/coreclr/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/src/coreclr/tests/src/Common/external/external.depproj b/src/coreclr/tests/src/Common/external/external.depproj
new file mode 100644
index 0000000..063c1f9
--- /dev/null
+++ b/src/coreclr/tests/src/Common/external/external.depproj
@@ -0,0 +1,56 @@
+<?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="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/src/coreclr/tests/src/Common/external/project.json b/src/coreclr/tests/src/Common/external/project.json
new file mode 100644
index 0000000..5c0e636
--- /dev/null
+++ b/src/coreclr/tests/src/Common/external/project.json
@@ -0,0 +1,24 @@
+{
+  "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",
+    "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/src/coreclr/tests/src/Common/test_dependencies/project.json b/src/coreclr/tests/src/Common/test_dependencies/project.json
index f5f41e1..7e219e3 100644
--- a/src/coreclr/tests/src/Common/test_dependencies/project.json
+++ b/src/coreclr/tests/src/Common/test_dependencies/project.json
@@ -1,79 +1,14 @@
 {
   "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-25110-02",
-    "Microsoft.NETCore.Targets": "1.2.0-beta-24913-02",
-    "System.Collections.Immutable": "1.4.0-beta-25110-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-25110-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-25110-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-25110-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-25110-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.Private.CoreFx.NETCoreApp": "4.4.0-beta-25110-02",
+    "System.Runtime.CompilerServices.Unsafe": "4.4.0-beta-25110-02"
   },
   "frameworks": {
-    "netcoreapp1.1": {
+    "netcoreapp2.0": {
       "imports": [
         "dnxcore50",
+        "netcoreapp1.1",
         "portable-net45+win8"
       ]
     }
diff --git a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj b/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
index 0649d2b..0b0f5b8 100644
--- a/src/coreclr/tests/src/Common/test_dependencies/test_dependencies.csproj
+++ b/src/coreclr/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/src/coreclr/tests/src/Common/test_runtime/project.json b/src/coreclr/tests/src/Common/test_runtime/project.json
index d4fda85..382d332 100644
--- a/src/coreclr/tests/src/Common/test_runtime/project.json
+++ b/src/coreclr/tests/src/Common/test_runtime/project.json
@@ -7,7 +7,7 @@
     "jit-analyze": "0.0.1.1"
   },
   "frameworks": {
-    "netcoreapp1.1": {
+    "netcoreapp2.0": {
       "imports": [
         "dnxcore50",
         "portable-net45+win8"
diff --git a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj b/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj
index ad0093a..3b55297 100644
--- a/src/coreclr/tests/src/Common/test_runtime/test_runtime.csproj
+++ b/src/coreclr/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/src/coreclr/tests/src/CoreMangLib/cti/system/text/unicodeencoding/unicodeencodinggetbytecount1.cs b/src/coreclr/tests/src/CoreMangLib/cti/system/text/unicodeencoding/unicodeencodinggetbytecount1.cs
index 4bc7f40..a753b13 100644
--- a/src/coreclr/tests/src/CoreMangLib/cti/system/text/unicodeencoding/unicodeencodinggetbytecount1.cs
+++ b/src/coreclr/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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Add1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Add1.csproj
index 480d150..c1f4b9e 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Add1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Add1.csproj
@@ -31,10 +31,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/And1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/And1.csproj
index a7c9fe6..2bd1674 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/And1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/And1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AndRef.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AndRef.csproj
index 6234219..8e49de2 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AndRef.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AndRef.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Args4.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Args4.csproj
index 3c6f2e6..5ddaa59 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Args4.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Args4.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Args5.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Args5.csproj
index 50b09e7..47522eb 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Args5.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Args5.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgAdd1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgAdd1.csproj
index 41ef18c..905e3c9 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgAdd1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgAdd1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgAnd1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgAnd1.csproj
index d3e1aee..aab71a7 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgAnd1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgAnd1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgOr1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgOr1.csproj
index 89c8dc1..361e138 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgOr1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgOr1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgSub1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgSub1.csproj
index cc57547..598a576 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgSub1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgSub1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgXor1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgXor1.csproj
index 47b8114..a0de7a0 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgXor1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/AsgXor1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/BinaryRMW.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/BinaryRMW.csproj
index 8a15f39..ec82afd 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/BinaryRMW.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/BinaryRMW.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Call1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Call1.csproj
index 8b51978..57594bc 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Call1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Call1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/CnsBool.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/CnsBool.csproj
index 1b63fbe..130ab80 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/CnsBool.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/CnsBool.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/CnsLng1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/CnsLng1.csproj
index 19d6a4e..d0d272e 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/CnsLng1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/CnsLng1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAdd.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAdd.csproj
index 69f670e..e49981b 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAdd.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAdd.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAddConst.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAddConst.csproj
index bbcc11f..ec98b3f 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAddConst.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAddConst.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblArea.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblArea.csproj
index db5eac4..84981eb 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblArea.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblArea.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblArray.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblArray.csproj
index d9acbe2..852b3b9 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblArray.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblArray.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAvg2.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAvg2.csproj
index 1c53f5a..4545b12 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAvg2.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAvg2.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAvg6.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAvg6.csproj
index af98342..554a653 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAvg6.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblAvg6.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblCall1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblCall1.csproj
index a16b102..ac7ca1f 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblCall1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblCall1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblCall2.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblCall2.csproj
index 43ea6bd..a16774a 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblCall2.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblCall2.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblDist.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblDist.csproj
index 6c5216d..0d86ec0 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblDist.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblDist.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblDiv.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblDiv.csproj
index 320f24c..68c2b6b 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblDiv.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblDiv.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblDivConst.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblDivConst.csproj
index 909c0d4..9aaa6fa 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblDivConst.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblDivConst.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblFillArray.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblFillArray.csproj
index 3a1508a..89e9e1f 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblFillArray.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblFillArray.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblMul.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblMul.csproj
index ab2bba9..548b6c9 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblMul.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblMul.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblMulConst.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblMulConst.csproj
index 40dad4a..30500d9 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblMulConst.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblMulConst.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblNeg.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblNeg.csproj
index a2391bc..8895b32 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblNeg.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblNeg.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblRem.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblRem.csproj
index 9efb75f..8b0c313 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblRem.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblRem.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblRoots.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblRoots.csproj
index 21b1d6c..c470081 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblRoots.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblRoots.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblSub.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblSub.csproj
index 3ff9aac..e96b0ae 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblSub.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblSub.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblSubConst.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblSubConst.csproj
index 68ec522..ee08a57 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblSubConst.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblSubConst.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblVar.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblVar.csproj
index 49fca7f..7aa3bd6 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblVar.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DblVar.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DivConst.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DivConst.csproj
index db7df56..509b96d 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DivConst.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/DivConst.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Eq1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Eq1.csproj
index d594e34..5229886 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Eq1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Eq1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAdd.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAdd.csproj
index 80e2e9c..d2a2f23 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAdd.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAdd.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAddConst.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAddConst.csproj
index a1ac64e..d5e052e 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAddConst.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAddConst.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPArea.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPArea.csproj
index a5c4217..b2c48d1 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPArea.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPArea.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPArray.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPArray.csproj
index 8925472..2f9bedd 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPArray.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPArray.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAvg2.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAvg2.csproj
index 8a43978..646cf99 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAvg2.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAvg2.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAvg6.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAvg6.csproj
index 96a5867..2a677cd 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAvg6.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPAvg6.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPCall1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPCall1.csproj
index 4f7dca0..1c6ef76 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPCall1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPCall1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPCall2.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPCall2.csproj
index bf06a2e..aecb8be 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPCall2.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPCall2.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvDbl2Lng.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvDbl2Lng.csproj
index 3c884a5..b3be43f 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvDbl2Lng.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvDbl2Lng.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvF2F.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvF2F.csproj
index 9a972cb..96c5784 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvF2F.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvF2F.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvF2I.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvF2I.csproj
index f0b2dc4..712225d 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvF2I.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvF2I.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvF2Lng.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvF2Lng.csproj
index 75fc1de..35422c5 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvF2Lng.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvF2Lng.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvI2F.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvI2F.csproj
index 9e0cdd8..a625f91 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvI2F.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPConvI2F.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPDist.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPDist.csproj
index 0de6088..7d25397 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPDist.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPDist.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPDiv.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPDiv.csproj
index f4b61f4..f0c2027 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPDiv.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPDiv.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPDivConst.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPDivConst.csproj
index 14a860f..2c69859 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPDivConst.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPDivConst.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPError.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPError.csproj
index bc16b57..3e62212 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPError.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPError.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPFillArray.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPFillArray.csproj
index 3205982..6ad7e2a 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPFillArray.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPFillArray.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPMath.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPMath.csproj
index 35d67a1..d22eded 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPMath.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPMath.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPMul.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPMul.csproj
index 4805cde..9f9f974 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPMul.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPMul.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPMulConst.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPMulConst.csproj
index 3b4a869..e0490cd 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPMulConst.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPMulConst.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPNeg.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPNeg.csproj
index bd9bf2f..08f3549 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPNeg.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPNeg.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPRem.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPRem.csproj
index 662c016..328cfa7 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPRem.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPRem.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPRoots.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPRoots.csproj
index b4504d7..34bc194 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPRoots.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPRoots.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPSmall.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPSmall.csproj
index 13e6b68..9b4f9bd 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPSmall.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPSmall.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPSub.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPSub.csproj
index 18b33b8..2b442e2 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPSub.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPSub.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPSubConst.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPSubConst.csproj
index 505b089..61dfbeb 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPSubConst.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPSubConst.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPVar.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPVar.csproj
index 10463a6..904743b 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPVar.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FPVar.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FactorialRec.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FactorialRec.csproj
index c76107c..9617216 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FactorialRec.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FactorialRec.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FibLoop.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FibLoop.csproj
index b5e204f..1d4ecf1 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FibLoop.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FibLoop.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FiboRec.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FiboRec.csproj
index 9184e91..0c8c800 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FiboRec.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/FiboRec.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Gcd.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Gcd.csproj
index 0c04d92..fb1c38a 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Gcd.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Gcd.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Ge1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Ge1.csproj
index ff180e3..ca35109 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Ge1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Ge1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Gt1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Gt1.csproj
index 7bf8440..c830c65 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Gt1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Gt1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Ind1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Ind1.csproj
index ae65600..188485d 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Ind1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Ind1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/InitObj.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/InitObj.csproj
index e408d49..8aebbab 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/InitObj.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/InitObj.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/InstanceCalls.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/InstanceCalls.csproj
index 49aff4e..e83253d 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/InstanceCalls.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/InstanceCalls.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/IntArraySum.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/IntArraySum.csproj
index 745504f..aa5cee2 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/IntArraySum.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/IntArraySum.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/IntConv.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/IntConv.csproj
index aecc1c9..9a2e983 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/IntConv.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/IntConv.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrue1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrue1.csproj
index ba1505c..8502a06 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrue1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrue1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueEqDbl.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueEqDbl.csproj
index 2b5040d..4c5191a 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueEqDbl.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueEqDbl.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueEqFP.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueEqFP.csproj
index 55b21f9..37d2d1e 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueEqFP.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueEqFP.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueEqInt1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueEqInt1.csproj
index b22506d..a3f327a 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueEqInt1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueEqInt1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGeDbl.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGeDbl.csproj
index e449f54..1728c45 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGeDbl.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGeDbl.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGeFP.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGeFP.csproj
index 7bb5d57..8cd388b 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGeFP.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGeFP.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGeInt1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGeInt1.csproj
index 05ae671..c2c2857 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGeInt1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGeInt1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGtDbl.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGtDbl.csproj
index 8f8719d..b4cc985 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGtDbl.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGtDbl.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGtFP.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGtFP.csproj
index 73e21e5..3cd2670 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGtFP.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGtFP.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGtInt1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGtInt1.csproj
index eac1960..fc9dce3 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGtInt1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueGtInt1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLeDbl.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLeDbl.csproj
index 1a44869..73f6180 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLeDbl.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLeDbl.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLeFP.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLeFP.csproj
index f0fc80d..83582ad 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLeFP.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLeFP.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLeInt1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLeInt1.csproj
index f8bd22e..c1e957f 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLeInt1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLeInt1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLtDbl.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLtDbl.csproj
index c1698ca..38a6f4a 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLtDbl.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLtDbl.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLtFP.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLtFP.csproj
index bf698bc..f0e9474 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLtFP.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLtFP.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLtInt1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLtInt1.csproj
index b177d9b..9205d4c 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLtInt1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueLtInt1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueNeDbl.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueNeDbl.csproj
index 954beed..86e077b 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueNeDbl.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueNeDbl.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueNeFP.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueNeFP.csproj
index 94b6808..93184b5 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueNeFP.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueNeFP.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueNeInt1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueNeInt1.csproj
index 50ae8d3..35e170f 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueNeInt1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/JTrueNeInt1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Jmp1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Jmp1.csproj
index 97a8c70..7dfdd05 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Jmp1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Jmp1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Le1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Le1.csproj
index b9fd245..993272c 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Le1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Le1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LeftShift.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LeftShift.csproj
index 52416a3..56a0c90 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LeftShift.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LeftShift.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LngConv.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LngConv.csproj
index 54ed57f..50f2d39 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LngConv.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LngConv.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Localloc.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Localloc.csproj
index 4ab3537..bda49d9 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Localloc.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Localloc.csproj
@@ -31,10 +31,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LocallocLarge.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LocallocLarge.csproj
index 2741389..100c651 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LocallocLarge.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LocallocLarge.csproj
@@ -31,10 +31,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LongArgsAndReturn.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LongArgsAndReturn.csproj
index 246be04..a83a83d 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LongArgsAndReturn.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/LongArgsAndReturn.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Lt1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Lt1.csproj
index fe4bc0f..ba17feb 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Lt1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Lt1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/ModConst.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/ModConst.csproj
index 14cfdb5..61d1e2d 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/ModConst.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/ModConst.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Ne1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Ne1.csproj
index c11af45..f7c090a 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Ne1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Ne1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NegRMW.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NegRMW.csproj
index 4aa1c4b..e1ba176 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NegRMW.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NegRMW.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NestedCall.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NestedCall.csproj
index 0691a3d..02a1f2a 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NestedCall.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NestedCall.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NotAndNeg.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NotAndNeg.csproj
index 8bc55a4..58809a3 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NotAndNeg.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NotAndNeg.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NotRMW.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NotRMW.csproj
index 07c96a0..07dea84 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NotRMW.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/NotRMW.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/ObjAlloc.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/ObjAlloc.csproj
index d6c089e..d508d8d 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/ObjAlloc.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/ObjAlloc.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/OpMembersOfStructLocal.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/OpMembersOfStructLocal.csproj
index 6809d7f..f4e772f 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/OpMembersOfStructLocal.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/OpMembersOfStructLocal.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Or1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Or1.csproj
index fabb977..e853184 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Or1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Or1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/OrRef.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/OrRef.csproj
index 230fe95..dba15ab 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/OrRef.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/OrRef.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/RecursiveTailCall.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/RecursiveTailCall.csproj
index c3cb6fc..5ac9598 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/RecursiveTailCall.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/RecursiveTailCall.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/RightShiftRef.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/RightShiftRef.csproj
index 3562262..8de24b0 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/RightShiftRef.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/RightShiftRef.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Rotate.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Rotate.csproj
index baa4c52..7839ff3 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Rotate.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Rotate.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Shift.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Shift.csproj
index 2189ed3..ca474bf 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Shift.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Shift.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StaticCalls.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StaticCalls.csproj
index 1480648..210b471 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StaticCalls.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StaticCalls.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StaticValueField.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StaticValueField.csproj
index 901cbd0..8d18e45 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StaticValueField.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StaticValueField.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StructFldAddr.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StructFldAddr.csproj
index a9aefbe..7291d34 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StructFldAddr.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StructFldAddr.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StructInstMethod.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StructInstMethod.csproj
index d4bba0f..0c92958 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StructInstMethod.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/StructInstMethod.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Sub1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Sub1.csproj
index cfbc9081..a05cb5d 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Sub1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Sub1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/SubRef.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/SubRef.csproj
index befff75..cdc71ea 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/SubRef.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/SubRef.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Swap.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Swap.csproj
index b97d170..59b3121 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Swap.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Swap.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Switch.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Switch.csproj
index eaa188d..8dff417 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Switch.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Switch.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/UDivConst.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/UDivConst.csproj
index 8649c56..9c8d41d 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/UDivConst.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/UDivConst.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/UModConst.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/UModConst.csproj
index d3ba4c3..78d1bce 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/UModConst.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/UModConst.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Unbox.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Unbox.csproj
index c646b87..5224815 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Unbox.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Unbox.csproj
@@ -31,10 +31,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Xor1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Xor1.csproj
index 3670831..01b705e 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Xor1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/Xor1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/XorRef.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/XorRef.csproj
index 5795c70..4b661ca 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/XorRef.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/XorRef.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/addref.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/addref.csproj
index f4c474d..b4072b6 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/addref.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/addref.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/div1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/div1.csproj
index 4380e97..67ae5fd 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/div1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/div1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/div2.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/div2.csproj
index 96b5a02..8bf803b 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/div2.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/div2.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/divref.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/divref.csproj
index 0f6f610..bab4b1b 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/divref.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/divref.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul1.csproj
index cf6cdcc..9c5c164 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul2.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul2.csproj
index 60aaa1c..823e5b3 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul2.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul2.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul3.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul3.csproj
index a7dffb8..a2e374d 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul3.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul3.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul4.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul4.csproj
index 8734602..2f567ff 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul4.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/mul4.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/rem1.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/rem1.csproj
index 7a2635b..faa8a70 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/rem1.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/rem1.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/CodeGenBringUpTests/struct16args.csproj b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/struct16args.csproj
index 99e90c4..b8729f6 100644
--- a/src/coreclr/tests/src/JIT/CodeGenBringUpTests/struct16args.csproj
+++ b/src/coreclr/tests/src/JIT/CodeGenBringUpTests/struct16args.csproj
@@ -30,10 +30,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/src/coreclr/tests/src/JIT/Directed/Arrays/Complex1.csproj b/src/coreclr/tests/src/JIT/Directed/Arrays/Complex1.csproj
index 9165d8b..e01bf2a 100644
--- a/src/coreclr/tests/src/JIT/Directed/Arrays/Complex1.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/Arrays/Complex1.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Directed/Arrays/Complex2.csproj b/src/coreclr/tests/src/JIT/Directed/Arrays/Complex2.csproj
index ab56291..b6fd2b6 100644
--- a/src/coreclr/tests/src/JIT/Directed/Arrays/Complex2.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/Arrays/Complex2.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Directed/Arrays/Simple1.csproj b/src/coreclr/tests/src/JIT/Directed/Arrays/Simple1.csproj
index e8377c0..fbc1c28 100644
--- a/src/coreclr/tests/src/JIT/Directed/Arrays/Simple1.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/Arrays/Simple1.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Directed/Arrays/Simple2.csproj b/src/coreclr/tests/src/JIT/Directed/Arrays/Simple2.csproj
index 74d173f..6e23574 100644
--- a/src/coreclr/tests/src/JIT/Directed/Arrays/Simple2.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/Arrays/Simple2.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj
index ad719cc..c5afecb 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj
index 6fa1667..2571bb0 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj
index 2f10438..e1a883d 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj
index c463c8e..711b442 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj
index 38790a8..376b3c9 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Base_6.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj
index 9f3b050..c38b2af 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj
index c81c109..40866a6 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj
index bcfbcd2..8afb75d 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj
index de22d67..ea9954a 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj
index 0b9517b..a4a6365 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Generic_Test_CSharp_Peer_6.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj
index 28f9b20..2598479 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj
index 661fa6f..a6760cb 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj
index 1b751c2..8b0d81f 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj
index 3565ca3..8055ae1 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Base_4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj
index 73f35f9..7c19166 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj
index cacc364..006f40d 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj
index 1c56932..87358dc 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj
index 7bf6c37..936cf5c 100644
--- a/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/CheckedCtor/Test_CSharp_Peer_4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/Convert/FPZero.csproj b/src/coreclr/tests/src/JIT/Directed/Convert/FPZero.csproj
index f0eea11..259c367 100644
--- a/src/coreclr/tests/src/JIT/Directed/Convert/FPZero.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/Convert/FPZero.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/ExcepFilters/mixed3/mixed3.ilproj b/src/coreclr/tests/src/JIT/Directed/ExcepFilters/mixed3/mixed3.ilproj
index 0eb85f1..d10c3e6 100644
--- a/src/coreclr/tests/src/JIT/Directed/ExcepFilters/mixed3/mixed3.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/ExcepFilters/mixed3/mixed3.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj b/src/coreclr/tests/src/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj
index aacc2c2..ebbb8ae 100644
--- a/src/coreclr/tests/src/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/IL/PInvokeTail/PInvokeTail.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.ilproj b/src/coreclr/tests/src/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.ilproj
index c9ca675..c91eab5 100644
--- a/src/coreclr/tests/src/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/IL/mutualrecur-tailcall/MutualRecur-TailCall.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/Misc/gettype/gettypetypeofmatrix.csproj b/src/coreclr/tests/src/JIT/Directed/Misc/gettype/gettypetypeofmatrix.csproj
index ceb0d9a..7137c68 100644
--- a/src/coreclr/tests/src/JIT/Directed/Misc/gettype/gettypetypeofmatrix.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/Misc/gettype/gettypetypeofmatrix.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_d.csproj
index 9e009ab..c78f108 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_do.csproj
index 2a99859..108a889 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_r.csproj
index 9323e65..66c769e 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_ro.csproj
index 060a204..763fb72 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv1_cs_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_d.csproj
index ffe02bc..9f835e0 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_do.csproj
index cb329e0..9032670 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_r.csproj
index bef2f25..a3914ec 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_ro.csproj
index 2286ad8..66df374 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/callconv2_cs_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="helper.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/helper.csproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/helper.csproj
index d7f3b67..9847c9c 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/helper.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/PrimitiveVT/helper.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/cpobj.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/cpobj.ilproj
index b1f6258..3442ebf 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/cpobj.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/cpobj.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/ldobj.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/ldobj.ilproj
index 316cdce..a061f18 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/ldobj.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/ldobj.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/localloc.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/localloc.ilproj
index 2046f092..b763a50 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/localloc.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/1/localloc.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/cpobj.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/cpobj.ilproj
index be72ac5..05fdc3f 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/cpobj.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/cpobj.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/ldobj.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/ldobj.ilproj
index 6946944..26492ee 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/ldobj.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/ldobj.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/localloc.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/localloc.ilproj
index 4c0411e..135ab61 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/localloc.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/2/localloc.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/cpobj.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/cpobj.ilproj
index b1f6258..3442ebf 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/cpobj.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/cpobj.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/ldobj.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/ldobj.ilproj
index 316cdce..a061f18 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/ldobj.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/ldobj.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/localloc.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/localloc.ilproj
index 2046f092..b763a50 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/localloc.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/unaligned/4/localloc.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/cpobj.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/cpobj.ilproj
index b1f6258..3442ebf 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/cpobj.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/cpobj.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/ldobj.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/ldobj.ilproj
index 316cdce..a061f18 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/ldobj.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/ldobj.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/localloc.ilproj b/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/localloc.ilproj
index 2046f092..b763a50 100644
--- a/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/localloc.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/PREFIX/volatile/1/localloc.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/RVAInit/extended.ilproj b/src/coreclr/tests/src/JIT/Directed/RVAInit/extended.ilproj
index 00f733d..637bbd8 100644
--- a/src/coreclr/tests/src/JIT/Directed/RVAInit/extended.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/RVAInit/extended.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/RVAInit/gcref1.ilproj b/src/coreclr/tests/src/JIT/Directed/RVAInit/gcref1.ilproj
index 7f25ede..e883a25 100644
--- a/src/coreclr/tests/src/JIT/Directed/RVAInit/gcref1.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/RVAInit/gcref1.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/RVAInit/gcref2.ilproj b/src/coreclr/tests/src/JIT/Directed/RVAInit/gcref2.ilproj
index 18c8b86..aa51ab9 100644
--- a/src/coreclr/tests/src/JIT/Directed/RVAInit/gcref2.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/RVAInit/gcref2.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/RVAInit/nested.ilproj b/src/coreclr/tests/src/JIT/Directed/RVAInit/nested.ilproj
index 9601306..e94e55d 100644
--- a/src/coreclr/tests/src/JIT/Directed/RVAInit/nested.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/RVAInit/nested.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/RVAInit/overlap.ilproj b/src/coreclr/tests/src/JIT/Directed/RVAInit/overlap.ilproj
index eb37bbf..b4015bd 100644
--- a/src/coreclr/tests/src/JIT/Directed/RVAInit/overlap.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/RVAInit/overlap.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/RVAInit/simple.ilproj b/src/coreclr/tests/src/JIT/Directed/RVAInit/simple.ilproj
index 380916f4..9877f04 100644
--- a/src/coreclr/tests/src/JIT/Directed/RVAInit/simple.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/RVAInit/simple.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_d.csproj
index 19c8c58..bcd8a42 100644
--- a/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_do.csproj
index d4b9b2e..25c0f83 100644
--- a/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_r.csproj
index d7dbb04..b0916bd 100644
--- a/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_ro.csproj
index 5c4c10c..3221d67 100644
--- a/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess1_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_d.csproj
index bdb14c1..2f92eb7 100644
--- a/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_do.csproj
index 9dd9b68..d418c68 100644
--- a/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_r.csproj
index a811c32..227323b 100644
--- a/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_ro.csproj
index e0e6f4b..b1d6e65 100644
--- a/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess2_cs_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_d.csproj
index d0d54ee..e7f8339 100644
--- a/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_do.csproj
index 8259844..72230be 100644
--- a/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_r.csproj
index 40aa870..7d3c9cb 100644
--- a/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_ro.csproj
index fdc416d..9a94cfa 100644
--- a/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess3_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess4.csproj b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess4.csproj
index 833fad1..4da3081 100644
--- a/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess4.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StrAccess/straccess4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StructABI/structfieldparam_r.csproj b/src/coreclr/tests/src/JIT/Directed/StructABI/structfieldparam_r.csproj
index a1ad373..54fd176 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructABI/structfieldparam_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructABI/structfieldparam_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/StructABI/structfieldparam_ro.csproj b/src/coreclr/tests/src/JIT/Directed/StructABI/structfieldparam_ro.csproj
index da98dd6..3160c45 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructABI/structfieldparam_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructABI/structfieldparam_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1.csproj b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1.csproj
index d1dd653..11485c6 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1a.csproj b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1a.csproj
index 1e76690..0c7d733 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1a.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1a.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1a2.csproj b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1a2.csproj
index 94d1a82..6705850 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1a2.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1a2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1b.csproj b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1b.csproj
index 7a747db..97b11c5 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1b.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1b.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1c.csproj b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1c.csproj
index daf6ad2..95ca827 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1c.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1c.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1d.csproj b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1d.csproj
index 1274175..4a7eb71 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP1d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2.csproj b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2.csproj
index 4ecbdcd..ef446be 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2a.csproj b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2a.csproj
index 38be276..6873463 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2a.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2a.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2b.csproj b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2b.csproj
index 38f17ab..a99dde0 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2b.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2b.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2c.csproj b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2c.csproj
index 952d274..f0809f9 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2c.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructPromote/SP2c.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StructPromote/SpAddr.csproj b/src/coreclr/tests/src/JIT/Directed/StructPromote/SpAddr.csproj
index 94bebd0..e9ca8e1 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructPromote/SpAddr.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructPromote/SpAddr.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/StructPromote/SpAddrAT.csproj b/src/coreclr/tests/src/JIT/Directed/StructPromote/SpAddrAT.csproj
index e15e0f1..3e82d86 100644
--- a/src/coreclr/tests/src/JIT/Directed/StructPromote/SpAddrAT.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/StructPromote/SpAddrAT.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/TypedReference/TypedReference.csproj b/src/coreclr/tests/src/JIT/Directed/TypedReference/TypedReference.csproj
index 5091a27..09c1b2a 100644
--- a/src/coreclr/tests/src/JIT/Directed/TypedReference/TypedReference.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/TypedReference/TypedReference.csproj
@@ -38,9 +38,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/src/coreclr/tests/src/JIT/Directed/UnrollLoop/Dev10_846218.csproj b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/Dev10_846218.csproj
index e4a9529..ffcb47e 100644
--- a/src/coreclr/tests/src/JIT/Directed/UnrollLoop/Dev10_846218.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/Dev10_846218.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_d.csproj
index ba2fb73..2ca6844 100644
--- a/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_do.csproj
index 2ed18a6..63d829a 100644
--- a/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_r.csproj
index c9be762..84f9709 100644
--- a/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj
index 3c40e01..a475853 100644
--- a/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop1_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_d.csproj
index 89e9297..858e10e 100644
--- a/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_do.csproj
index ddb3702..7566678 100644
--- a/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_r.csproj
index d77d898..29e770a 100644
--- a/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj
index b97b5c6..d7f8c21 100644
--- a/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop4_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj
index 78d4b25..21ff555 100644
--- a/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_d.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj
index 36eb47f..d819300 100644
--- a/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_do.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj
index 7dc344c..4dd958b 100644
--- a/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_r.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj
index 6c995fe..c9b752c 100644
--- a/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/UnrollLoop/loop6_cs_ro.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Directed/array-il/_Arrayscomplex3.ilproj b/src/coreclr/tests/src/JIT/Directed/array-il/_Arrayscomplex3.ilproj
index 641d1e9..f3ebc12 100644
--- a/src/coreclr/tests/src/JIT/Directed/array-il/_Arrayscomplex3.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/array-il/_Arrayscomplex3.ilproj
@@ -36,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj
index 4b60885..c77e4f8 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj
index 8c81d37..a49e87a 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj
index 5d04b40..e64b758 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj
index 23917bc..8562f37 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_And_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj
index de3e07c..d6f2048 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj
index 17edf3a..236138d 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj
index b304b76..4e27ddc 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj
index 5462fc0..71597cf 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_No_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj
index 6de3885..038c675 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj
index e91c946..13b0c7a 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj
index 3685e5f..4f9026b 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj
index e4912fd..c3e7475 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Or_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj
index 7116fa0..b5b968a 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj
index d0a3bb7..0314d0d 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj
index 16b1dbc..bff4102 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj
index 66adfe5..4d69f59 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Bool_Xor_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_d.csproj
index c17e8f0..8053041 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_do.csproj
index 0ccfc8f..739f754 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_r.csproj
index 1d4653e..a29aed2 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj
index cb97705..e15a536 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_And_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_d.csproj
index 1af11b9..aa0b786 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_do.csproj
index 1e67778..3be54be 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_r.csproj
index 2aa63ef..a0d36a1 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj
index 0369a0c..4c1808c 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_No_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj
index d3f2261..3f9f981 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj
index f114c96..3ca6d0b 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj
index 427a756..6f0c3ef 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj
index 28046b3..034b3eb 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Or_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj
index b657ea8..a382ee1 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj
index 01d630f..6739e14 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj
index 2a3f627..ba0b41f 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj
index 9b44109..e45c502 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Double_Xor_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_d.csproj
index 3ab8d35..64b9e6b 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_do.csproj
index c5bc686..4f2cf8d 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_r.csproj
index 515f5d5..40773f8 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj
index 5000a7e..9efb698 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_And_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_d.csproj
index e70c90c..121d6a8 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_do.csproj
index bb95929..a8de65c 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_r.csproj
index 96a181c..b6afcef 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj
index 60c514d..4088c99 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_No_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj
index 9466ec9..1452953 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj
index 4ff18b8..c99aac6 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj
index 34f3123..c787445 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj
index 1371f86..48e790f 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Or_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj
index 79dcaa9..49c52e8 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj
index fe0567b..a51951e 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj
index f8fae86..18a94a2 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj
index 7b402bb..0d7cbfc 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Float_Xor_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_d.csproj
index 7d994a3..7c515b5 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_do.csproj
index 238b3ef..d10dd8c 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_r.csproj
index ac64263..4233266 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj
index 8bed3fb1..e0a63c0 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_And_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_d.csproj
index a09e778..d99daef4 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_do.csproj
index c4d0b1b..6c8c1dd 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_r.csproj
index ec4385a..dc4008e 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj
index 5067895..e16f52a 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_No_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj
index ecda3af..2dc47f7 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj
index eb8acf6..c981801 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj
index 4ec9965..dd87190 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj
index 26c5106..952e566 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Or_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj
index cf2bbb5..71d586c 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj
index f9fac8c..81934fa 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj
index a690f2c..f6d63a0 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj
index 3d1cba0..84a0940 100644
--- a/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/cmov/Int_Xor_Op_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/compiler/FilterToHandler.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/compiler/FilterToHandler.ilproj
index 6f21850..734e73a 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/compiler/FilterToHandler.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/compiler/FilterToHandler.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj
index bd1d45c..0875db3 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj
index c0d43c3..d6c1185 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj
index 4da2c90..0aa392f 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj
index bb64852..f340d5d 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/flowgraph/xaddmuly_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_d.ilproj
index ad491f2..96fbe57 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_r.ilproj
index 8f1a7fa..ab2c5b5 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badendfinally_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_d.ilproj
index d32ce5d..bfbc94a 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_r.ilproj
index ca342ae..34f7140 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badldsfld_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_d.ilproj
index 5bb7b06..9c34e57 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_r.ilproj
index 9ce1bf1..4d75924 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/badtailcall_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_d.ilproj
index 4f07c17..c401fbe 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_r.ilproj
index b8662c8..d2bb5cc 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/bleref_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_d.ilproj
index 7ee3aa1..94a7748 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_r.ilproj
index e49a12c..bef6e5f 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/byrefsubbyref1_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_d.ilproj
index a5c785f..f22216f 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_r.ilproj
index 2bb4dcc..0981102 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/calli2_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_d.ilproj
index 510e40b..04822d1 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_r.ilproj
index 0f2cea0..852a9e4 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ceeillegal_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_d.ilproj
index 69fef2c..cac769b 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_r.ilproj
index 6e2cd74..54d0f0c 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr1_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_d.ilproj
index 81a5a71..632d0b5 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_r.ilproj
index a1acb15..66f9ed1 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldelemnullarr2_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_d.ilproj
index 40f3576..4811c06 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_r.ilproj
index 16eec75..507e0f0 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldr4_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_d.ilproj
index 66141cb..5d3dc6b 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_d.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_r.ilproj
index 33aec60..7d3ae9b 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldstatic1_il_r.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_d.ilproj
index 7107399..2be6b74 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_r.ilproj
index 07395f7..4d29197 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldfldunboxedvt_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_d.ilproj
index a34c688..ce12364 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_r.ilproj
index 5fc12a6..6081b6e 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/ldvirtftnsideeffect_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_d.ilproj
index 97b4d61..5bbf641 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_r.ilproj
index 60e343d..80fc24d 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nonrefsdarr_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_d.ilproj
index b7de6f8..c81dd83 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_r.ilproj
index 2fd39ab..895fa91 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/nullsdarr_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_d.ilproj
index eaabf5f..9549b72 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_r.ilproj
index e96e873..47300f4 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/refanytype1_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_d.ilproj
index 795770c..0455793 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_d.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_r.ilproj
index 4d3f00a..b42625f 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/stfldstatic1_il_r.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_d.ilproj
index 32f575a..e262cee 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_d.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_r.ilproj
index 2199732..6940e2b 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/subovfun1_il_r.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d.ilproj
index 550223e..88590f8 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r.ilproj
index 9fc7ab8..7c96259 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilldind_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_d.ilproj
index 059aa63..a574e07 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r.ilproj
index 63f2dc6..630964e 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/importer/Desktop/volatilstind_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj
index daf5527..aaaac88 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj
index b61c710..6e4521b 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj
index 17d8ac1..c532195 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj
index 04af665..19a074a 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/33objref_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj
index eff3bc8..04d4f8d 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj
index 8d206d9..de39f6a 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj
index f112ea3..50af478 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj
index 55e2d2b..dd1cf4f 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse1_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj
index 0f1f0b9..2369b37 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj
index ecf6b68..0c9c5e8 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj
index e6c840d..9c1b578 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj
index 14bc157..fa2019b 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/cse2_cs_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj
index c5405c4..8066087 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj
index 0331fd5..6403b9a 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj
index 627d131..88b95d0 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj
index 62eca65..9c3572e 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldadd_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj
index 433e35b..407e027 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj
index 20ad103..a30d239 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj
index 2450d48..ce4be59 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj
index c207626..fb92e55 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclflddiv_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj
index 38bc057..6431422 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj
index 4cd91ae..29d6ab8 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj
index 9342bad..664ea91 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj
index ad1f948..c873d73 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldmul_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj
index 47354ab..a58d2e4 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj
index 30c22ef..d0b0649 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj
index f9bb187..1364c74 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj
index 98371f1..634119b 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldrem_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj
index dc812fa..16b0c93 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj
index 13fbe34..62771db 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj
index 9ac380e..74e9051 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj
index 0989a0b..776817f 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/lclfldsub_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_d.ilproj
index f00cf25..4dc202a 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_r.ilproj
index 3b7badd..552893b 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ldfldstatic_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_d.ilproj
index ef082dc..b409a54 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_r.ilproj
index 2055267..244119a 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovfldiv1_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_d.ilproj
index effa984..c0c6482 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_r.ilproj
index eacc129..18cdcb7 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/ovflrem1_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tls1.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tls1.ilproj
index 10ce051..67e127f 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tls1.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tls1.ilproj
@@ -37,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tls2.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tls2.ilproj
index e320cd8..3f28ef1 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tls2.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tls2.ilproj
@@ -37,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_d.ilproj
index 65759fd..36b64e1 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_d.ilproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_r.ilproj
index 04067a6..c156a4c 100644
--- a/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/coverage/oldtests/tlstest_il_r.ilproj
@@ -39,10 +39,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>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/forceinlining/LargeNumberOfArgs.csproj b/src/coreclr/tests/src/JIT/Directed/forceinlining/LargeNumberOfArgs.csproj
index 623b227..2eb8f9d 100644
--- a/src/coreclr/tests/src/JIT/Directed/forceinlining/LargeNumberOfArgs.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/forceinlining/LargeNumberOfArgs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Directed/forceinlining/NoMetaData.csproj b/src/coreclr/tests/src/JIT/Directed/forceinlining/NoMetaData.csproj
index 9da577b..05a0286 100644
--- a/src/coreclr/tests/src/JIT/Directed/forceinlining/NoMetaData.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/forceinlining/NoMetaData.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Directed/forceinlining/Recursion.csproj b/src/coreclr/tests/src/JIT/Directed/forceinlining/Recursion.csproj
index 49851c5..53561e5 100644
--- a/src/coreclr/tests/src/JIT/Directed/forceinlining/Recursion.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/forceinlining/Recursion.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Directed/gettypetypeof/gettypetypeofmatrix.csproj b/src/coreclr/tests/src/JIT/Directed/gettypetypeof/gettypetypeofmatrix.csproj
index f183426..8915e2e 100644
--- a/src/coreclr/tests/src/JIT/Directed/gettypetypeof/gettypetypeofmatrix.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/gettypetypeof/gettypetypeofmatrix.csproj
@@ -38,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/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj
index cf820cc..9bf4944 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.csproj
@@ -35,10 +35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj
index 970d86a..712fc88 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/cmpxchg.csproj
@@ -35,10 +35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj
index 78868b7..205fba4 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.csproj
@@ -35,10 +35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj
index 90aae39..c5e348c 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/nullchecksuppress.csproj
@@ -35,10 +35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/regalloc1.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/regalloc1.csproj
index 99c82b6..bf27541 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/regalloc1.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/regalloc1.csproj
@@ -35,10 +35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/regalloc2.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/regalloc2.csproj
index 7d09218..180563d 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/regalloc2.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/regalloc2.csproj
@@ -35,10 +35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic1.ilproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic1.ilproj
index 6a873f9..dd0cb72 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic1.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic1.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic2.ilproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic2.ilproj
index e45e019..a37aaa0 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic2.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic2.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic3.ilproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic3.ilproj
index 31728bb..d1ec649 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic3.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic3.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic4.ilproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic4.ilproj
index e912102..7584130 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic4.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/interlocked/rva_rvastatic4.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj
index a8a5fb5..c91707d 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj
index 956dfd5..cab86ca 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj
index e22c844..3dd373c 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj
index fcef9d6..ca4cd6f 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow0_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow1.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow1.csproj
index f8524f3..096f5dd 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow1.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj
index 8968c02..403f78f 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj
index ca5cd5a..09f4b38 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj
index 719bff5..000452a 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj
index 6acbf20..942e3bb 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow2_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj
index 188c2d8..4ef99f7 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj
index aee7c47..822a2b6 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj
index c8eaf02..33abf42 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj
index fbc5ba9..37facf3 100644
--- a/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/intrinsic/pow/pow3_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/lifetime/lifetime1.csproj b/src/coreclr/tests/src/JIT/Directed/lifetime/lifetime1.csproj
index 14e03a4..066bf81 100644
--- a/src/coreclr/tests/src/JIT/Directed/lifetime/lifetime1.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/lifetime/lifetime1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/lifetime/lifetime2.csproj b/src/coreclr/tests/src/JIT/Directed/lifetime/lifetime2.csproj
index b5a3146..8900159 100644
--- a/src/coreclr/tests/src/JIT/Directed/lifetime/lifetime2.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/lifetime/lifetime2.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_d.csproj
index 59d2a41..999a2bf 100644
--- a/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_do.csproj
index ae4b20a..0392787 100644
--- a/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_r.csproj
index 45e404c..f29c1e0 100644
--- a/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_ro.csproj
index fdea7a5..edb5100 100644
--- a/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/localloc/localloc3_cs_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/newarr/newarr.csproj b/src/coreclr/tests/src/JIT/Directed/newarr/newarr.csproj
index e7c681f..85ba6e8 100644
--- a/src/coreclr/tests/src/JIT/Directed/newarr/newarr.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/newarr/newarr.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_do.csproj
index 9f3ad34..e9697db 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_r.csproj
index 557245a..a72b7c4 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_ro.csproj
index ccb575d..7f9bd2b 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/boxunboxvaluetype_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_d.csproj
index 8e8c9e6..2a0a84d 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_do.csproj
index 30cf499..0f52439 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_r.csproj
index 6efda5a..3df7cbd 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_ro.csproj
index 5ca46ee..a415caf 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/Desktop/nullcomparaison_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_d.csproj
index b707967..87f9ec3 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_do.csproj
index 548ec39..e37fc57 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_r.csproj
index d3b991a..0b0a85a 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_ro.csproj
index a8ac0b5..8a488ca 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxenum_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_d.csproj
index dd04ece..c6ec80d 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_do.csproj
index ce3c880..dd6c6ee 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_r.csproj
index b64525b..54e0b10 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_ro.csproj
index 9b65d14..06c1c20 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/boxunboxinterface_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_d.csproj
index 62ee76b..0e7ee8f 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_do.csproj
index 9b7cd29..2d6169b 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_r.csproj
index e90f844..a59a88d 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_ro.csproj
index 1f59571..c0b19c7 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassenum_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_d.csproj
index 6cd108b..30b9f99 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_do.csproj
index 0f46e58..f867502 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_r.csproj
index 2617645..4780112 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_ro.csproj
index d9b3322..239c11d 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassinterface_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_d.csproj
index 78ce99d..4521545 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_do.csproj
index 14f13e3..63ec99c 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_r.csproj
index db14d6e..7bd0388 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_ro.csproj
index 3901561..74bce93 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/castclassvaluetype_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_d.csproj
index 980c5ac..7f6138a 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_d.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_do.csproj
index 726d4b2..f5cc95a 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_do.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_r.csproj
index ee5bd84..105e7ed 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_r.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_ro.csproj
index e19dc21..ade6d5e 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/constructor_ro.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_d.csproj
index c444e55..67db9fd 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_d.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_do.csproj
index c96cc91..20bda24 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_do.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_r.csproj
index 5e4bd66..85bf905 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_r.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_ro.csproj
index 34a2b73..a08b6c5 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hashcode_ro.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_d.csproj
index 16ba577..536039d 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_d.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_do.csproj
index e792df3..ddba0e8 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_do.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_r.csproj
index 034a3b2..ac54531 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_r.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_ro.csproj
index 06934c5..26e35cc 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/hasvalue_ro.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_d.csproj
index eae13fa..3e0dace 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_d.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_do.csproj
index b07cb2e..8d4ff8a 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_do.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_r.csproj
index ad709a1..ae9b71e 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_r.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_ro.csproj
index ef456c9..9f6a0a6 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/invocation_ro.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_d.csproj
index 20467f8..80bce5d 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_do.csproj
index ea35e31..900c4a1 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_r.csproj
index a45e96c..530067e 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_ro.csproj
index f90c955..fc4c016 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst2_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_d.csproj
index 3b12dad..3a36be1 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_do.csproj
index 4f4fd59..47b86e1 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_r.csproj
index 4207ebb..bc9fd94 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_ro.csproj
index 257583b..efd2364 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinst_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_d.csproj
index c2f3895..f32abb0 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_do.csproj
index 5a6b260..7173773 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_r.csproj
index 7736d4a..f3bc4f9 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_ro.csproj
index 3616ae1..4730c23 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstboxed_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_d.csproj
index ad696bc..1d5cb24 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_do.csproj
index 7419485..430dc26 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_r.csproj
index 1a2a076..4140f85 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_ro.csproj
index dd98319..70c72be 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstenum_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_d.csproj
index d794c90..4e5aa8a 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_do.csproj
index c98615c..40eb030 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_r.csproj
index bf40451..d96b17a 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_ro.csproj
index 6fe1292..ef40ad0 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstgenerics_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_d.csproj
index 6e5d9e6..f671ed5 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_do.csproj
index a79bfbb..12ae1ab 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_r.csproj
index a9b86ef..b84a64c 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_ro.csproj
index d772b05..f2f6f1b 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstinterface_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_d.csproj
index 5cbe359..297ac6b 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_do.csproj
index 269f4b7..5a7cf73 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_r.csproj
index f49abd5..aa617b1 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_ro.csproj
index f1be01a..bb0f532 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/isinstvaluetype_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_d.csproj
index 3516406..f59c208 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_d.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_do.csproj
index 319d640..68e1a06 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_do.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_r.csproj
index 9042ddd..52a75d1 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_r.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_ro.csproj
index c3d9de1..6599956 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/tostring_ro.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_d.csproj
index f016100..ed0bb78 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_do.csproj
index 596bd51..7c3514a 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_r.csproj
index f9cd632..86ffd99 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_ro.csproj
index a84fa87..7bfe304 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/unboxnullable_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_d.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_d.csproj
index d4288ce..9ec4082 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_do.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_do.csproj
index de30d0e..ef46546 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_r.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_r.csproj
index 767d39d..d72a417 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_ro.csproj b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_ro.csproj
index 3a92cda..4ea6a33 100644
--- a/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/nullabletypes/value_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_d.csproj
index 2ba782e..ff2e34c 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_do.csproj
index b1cc093..5a8aec4 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_r.csproj
index a614ff7..eabc64f 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_ro.csproj
index ec2eb2e..8b1413f 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/commutativecse/ccse_cs_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_d.csproj
index b75d378..9e09a39 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_d.csproj
@@ -40,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_do.csproj
index cfb3471..fff4328 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_do.csproj
@@ -40,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_r.csproj
index 25f165e..2e7a7c2 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_r.csproj
@@ -40,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_ro.csproj
index cd47917..00ae79a 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv1_cs_ro.csproj
@@ -40,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_d.csproj
index b2071b0..d664eae 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_d.csproj
@@ -40,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_do.csproj
index e860007..30852e5 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_do.csproj
@@ -40,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_r.csproj
index 6bc431a..bf6ad59 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_r.csproj
@@ -40,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_ro.csproj
index d27ceec..71fc62c 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv2_cs_ro.csproj
@@ -40,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_d.ilproj
index 8175f99..26a9bb3 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_r.ilproj
index 3d8d934..9b617f6 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/callconv3_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_d.ilproj
index 25840a6..93bdccd 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_r.ilproj
index 573170d..af1ebba 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/identity3_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_d.csproj
index 5c782e7..77e212f 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_do.csproj
index 9913d93..0ccc59d 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_r.csproj
index 28e81b8..b03ecb3 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.csproj
index db11161..e990647 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed1_cs_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_d.csproj
index 9361b07..8069364 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_do.csproj
index d012b34..da2eba0 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_r.csproj
index afb1a51..760060f 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.csproj
index 4a72942..5d610e1 100644
--- a/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/perffix/primitivevt/mixed2_cs_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Directed/pinning/object-pin/object-pin.ilproj b/src/coreclr/tests/src/JIT/Directed/pinning/object-pin/object-pin.ilproj
index 03beaf4..4cab0a7 100644
--- a/src/coreclr/tests/src/JIT/Directed/pinning/object-pin/object-pin.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/pinning/object-pin/object-pin.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/pinvoke/calli_excep.ilproj b/src/coreclr/tests/src/JIT/Directed/pinvoke/calli_excep.ilproj
index cdd09fa..7586311 100644
--- a/src/coreclr/tests/src/JIT/Directed/pinvoke/calli_excep.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/pinvoke/calli_excep.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/pinvoke/pinvoke-bug.csproj b/src/coreclr/tests/src/JIT/Directed/pinvoke/pinvoke-bug.csproj
index 2f8a246..dfdf831 100644
--- a/src/coreclr/tests/src/JIT/Directed/pinvoke/pinvoke-bug.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/pinvoke/pinvoke-bug.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Directed/pinvoke/pinvoke-examples.csproj b/src/coreclr/tests/src/JIT/Directed/pinvoke/pinvoke-examples.csproj
index 78cf447..81c407f 100644
--- a/src/coreclr/tests/src/JIT/Directed/pinvoke/pinvoke-examples.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/pinvoke/pinvoke-examples.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.ilproj b/src/coreclr/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.ilproj
index a17e486..244ecd1 100644
--- a/src/coreclr/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/pinvoke/preemptive_cooperative.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/pinvoke/sin.csproj b/src/coreclr/tests/src/JIT/Directed/pinvoke/sin.csproj
index ceabb95..f7d5404 100644
--- a/src/coreclr/tests/src/JIT/Directed/pinvoke/sin.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/pinvoke/sin.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Directed/pinvoke/sysinfo_cs.csproj b/src/coreclr/tests/src/JIT/Directed/pinvoke/sysinfo_cs.csproj
index 445e5be..73fd867 100644
--- a/src/coreclr/tests/src/JIT/Directed/pinvoke/sysinfo_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/pinvoke/sysinfo_cs.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Directed/pinvoke/tail.ilproj b/src/coreclr/tests/src/JIT/Directed/pinvoke/tail.ilproj
index 83b9751..ffdce6b 100644
--- a/src/coreclr/tests/src/JIT/Directed/pinvoke/tail.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/pinvoke/tail.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/refbyref/byref2iu_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/refbyref/byref2iu_il_d.ilproj
index b947170..aea4064 100644
--- a/src/coreclr/tests/src/JIT/Directed/refbyref/byref2iu_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/refbyref/byref2iu_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/refbyref/byref2iu_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/refbyref/byref2iu_il_r.ilproj
index f9928a5..46cd56c 100644
--- a/src/coreclr/tests/src/JIT/Directed/refbyref/byref2iu_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/refbyref/byref2iu_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/refbyref/ref2byref_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/refbyref/ref2byref_il_d.ilproj
index 3a0e223..4768632 100644
--- a/src/coreclr/tests/src/JIT/Directed/refbyref/ref2byref_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/refbyref/ref2byref_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/refbyref/ref2byref_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/refbyref/ref2byref_il_r.ilproj
index 78ec4e1..5f9b54e 100644
--- a/src/coreclr/tests/src/JIT/Directed/refbyref/ref2byref_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/refbyref/ref2byref_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/refbyref/ref2iu_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/refbyref/ref2iu_il_d.ilproj
index 29a908f..d4f0595 100644
--- a/src/coreclr/tests/src/JIT/Directed/refbyref/ref2iu_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/refbyref/ref2iu_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/refbyref/ref2iu_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/refbyref/ref2iu_il_r.ilproj
index 7d15be5..d6ab2f7 100644
--- a/src/coreclr/tests/src/JIT/Directed/refbyref/ref2iu_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/refbyref/ref2iu_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/refbyref/refpinned2iu_il_d.ilproj b/src/coreclr/tests/src/JIT/Directed/refbyref/refpinned2iu_il_d.ilproj
index 8e86d7b..a7a2001 100644
--- a/src/coreclr/tests/src/JIT/Directed/refbyref/refpinned2iu_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/refbyref/refpinned2iu_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/refbyref/refpinned2iu_il_r.ilproj b/src/coreclr/tests/src/JIT/Directed/refbyref/refpinned2iu_il_r.ilproj
index a07f057..1848f83 100644
--- a/src/coreclr/tests/src/JIT/Directed/refbyref/refpinned2iu_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/refbyref/refpinned2iu_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic1.ilproj b/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic1.ilproj
index 590e6bd..955521b 100644
--- a/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic1.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic1.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic2.ilproj b/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic2.ilproj
index a753483..7aefa8e 100644
--- a/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic2.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic2.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic3.ilproj b/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic3.ilproj
index ed0f8b6..3d6adb8 100644
--- a/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic3.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic3.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic4.ilproj b/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic4.ilproj
index a898d56..7676d3c 100644
--- a/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic4.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic4.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic5.ilproj b/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic5.ilproj
index 2dc8498..cb59553 100644
--- a/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic5.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/rvastatics/rvastatic5.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_d.csproj
index 8bbcee5..4f6be77 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_do.csproj
index 4d9e47f..5509b63 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_r.csproj
index 438d50d..53ae5c7 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_ro.csproj
index 1586232..def8ca3 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int16_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/int16_d.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int16_d.csproj
index 7cbfefc..d4a26ed 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int16_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int16_d.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/int16_do.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int16_do.csproj
index 9bc9368..2ea2e6d 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int16_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int16_do.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/int16_r.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int16_r.csproj
index 2fa5e68..3c3f752 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int16_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int16_r.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Directed/shift/int16_ro.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int16_ro.csproj
index 7f9eb2c..88a10bd 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int16_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int16_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_d.csproj
index 877b43c..4521cf3 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_do.csproj
index 95e557e..3edc7f7 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_r.csproj
index 91618a6..dd448c4 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_ro.csproj
index d8b186c..d4269ff 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int32_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/int32_d.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int32_d.csproj
index bf2ea0b..dbe1073 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int32_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int32_d.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/int32_do.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int32_do.csproj
index 19d9d6a..108c1ea 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int32_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int32_do.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/int32_r.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int32_r.csproj
index a8b8db2..dfa39c0 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int32_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int32_r.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Directed/shift/int32_ro.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int32_ro.csproj
index 875fa86..6147801 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int32_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int32_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/shift/int64_d.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int64_d.csproj
index 3ae302f..79495ee 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int64_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int64_d.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/int64_do.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int64_do.csproj
index 4a2c9b5..560480d 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int64_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int64_do.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/int64_r.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int64_r.csproj
index 4be26a1..b4ec7ad 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int64_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int64_r.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Directed/shift/int64_ro.csproj b/src/coreclr/tests/src/JIT/Directed/shift/int64_ro.csproj
index a0fce3f..65ea2bd 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/int64_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/int64_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_d.csproj
index 13e591a..67ad0c5 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_do.csproj
index 70e0e09..e8a4f7c 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_r.csproj
index 0a0d2cf..f7aa660 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_ro.csproj
index 3e74884..b0b3027 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint16_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/uint16_d.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint16_d.csproj
index 0a379d5..d6d9e76 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint16_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint16_d.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/uint16_do.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint16_do.csproj
index fc4a0d9..1e6d0e7 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint16_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint16_do.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/uint16_r.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint16_r.csproj
index c2957d3..6e94b00 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint16_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint16_r.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Directed/shift/uint16_ro.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint16_ro.csproj
index 7e24155..d05ea4b 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint16_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint16_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_d.csproj
index c48ff04..4de3e03 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_do.csproj
index 72dc534..e32d979 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_r.csproj
index 1f13bb5..b49d1b6 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_ro.csproj
index 44d047b..9e461c2 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint32_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/uint32_d.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint32_d.csproj
index 9e8a98b..73126f9 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint32_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint32_d.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/uint32_do.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint32_do.csproj
index 261456d..013345b 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint32_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint32_do.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/uint32_r.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint32_r.csproj
index 4d791b2..152f681 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint32_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint32_r.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Directed/shift/uint32_ro.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint32_ro.csproj
index 175e647..eaeed2f 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint32_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint32_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_d.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_d.csproj
index f5b60d6..36d791b 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_d.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_do.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_do.csproj
index cb929c6..5011ae5 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_do.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_r.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_r.csproj
index 157c0ab..8f5bf4b 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_r.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_ro.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_ro.csproj
index c7e008d..4c2b3fd 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint64Opt_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/shift/uint64_d.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint64_d.csproj
index 9bbebb0..aea1fc9 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint64_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint64_d.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/uint64_do.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint64_do.csproj
index 0ef55d3..662ece6 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint64_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint64_do.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/uint64_r.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint64_r.csproj
index 3210eec..5f85088 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint64_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint64_r.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Directed/shift/uint64_ro.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint64_ro.csproj
index 0a92f64..b554ee2 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint64_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint64_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_d.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_d.csproj
index b4e5008..98146cc 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_do.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_do.csproj
index a1d4f78..cfdf48c 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_r.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_r.csproj
index c5f1cf7..b764bdf 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_ro.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_ro.csproj
index 1f39ca0..49822aa 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint8_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Directed/shift/uint8_d.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint8_d.csproj
index c9e76d7..23f4b8e 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint8_d.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint8_d.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/uint8_do.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint8_do.csproj
index a73ef11..1495849 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint8_do.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint8_do.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Directed/shift/uint8_r.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint8_r.csproj
index 583ea98..ed202b4 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint8_r.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint8_r.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Directed/shift/uint8_ro.csproj b/src/coreclr/tests/src/JIT/Directed/shift/uint8_ro.csproj
index a29823a..375e9b4 100644
--- a/src/coreclr/tests/src/JIT/Directed/shift/uint8_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Directed/shift/uint8_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Directed/tailcall/tailcall.ilproj b/src/coreclr/tests/src/JIT/Directed/tailcall/tailcall.ilproj
index 55da0f6..07be0b3 100644
--- a/src/coreclr/tests/src/JIT/Directed/tailcall/tailcall.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/tailcall/tailcall.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/tls/mutualrecurthd-tls.ilproj b/src/coreclr/tests/src/JIT/Directed/tls/mutualrecurthd-tls.ilproj
index d905a72..eb20178 100644
--- a/src/coreclr/tests/src/JIT/Directed/tls/mutualrecurthd-tls.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/tls/mutualrecurthd-tls.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Directed/tls/test-tls.ilproj b/src/coreclr/tests/src/JIT/Directed/tls/test-tls.ilproj
index aaf8bdb..75f0826 100644
--- a/src/coreclr/tests/src/JIT/Directed/tls/test-tls.ilproj
+++ b/src/coreclr/tests/src/JIT/Directed/tls/test-tls.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj
index 12e71d9..1237741 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.csproj
index 1dbddbd..4e70fdc 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/Struct01_instance.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.csproj
index 8371bf2..5e888c1 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.csproj
index 0d4392a..2343116 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_instance.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.csproj
index fae142d..aa3b6e1 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class01_static.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.csproj
index 57e6f64..91f0052 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class02.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.csproj
index bc66a5a..05ecdda 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class03.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.csproj
index 466d9fa..423f6a4 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class04.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.csproj
index 3ad9cd0..cd40d04 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class05.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj
index 1d65175..413e3ca 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class06.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj
index b89d7df..6f117c9 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/class07.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj
index 5a913ab..51c71be 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struc01.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.csproj
index 206a27c..d21fe4c 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct01_static.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.csproj
index 9442024..c766de9 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct02.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.csproj
index 99a24d0..056b2ed 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct03.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.csproj
index eb15ece..71296c8 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct04.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.csproj
index 6b7d3a2..89194c3 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct05.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj
index 55c15a7..3e00e2d 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct06.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj
index 54513a4..6314939 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/Jagged/struct07.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.csproj
index 84127fe..c6b4570 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance.csproj
index 7d6a94a..ec8a8e0 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_instance.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.csproj
index 40e348f..9519309 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/class01_static.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.csproj
index a5d746e..0c3214b 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance.csproj
index feadea8..f76bd59 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_instance.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.csproj
index 5cc4d88..61e92b6 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/ConstructedTypes/MultiDim/struct01_static.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/class01.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/class01.csproj
index 55a3ca7..b362e94 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.csproj
index bb8f547..49ea6aa 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/Jagged/struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.csproj
index d1c9e2f..ac04208 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.csproj
index 9368793..6f205b8 100644
--- a/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Arrays/TypeParameters/MultiDim/struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_d.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_d.csproj
index e3e3b59..18b2a56 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_do.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_do.csproj
index 475c026..07ccc98 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_r.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_r.csproj
index f3307f3..09c1fe6 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj
index 6b77d57..1b6d115 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_il_d.ilproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_il_d.ilproj
index dfb06b1..99d3898 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_il_r.ilproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_il_r.ilproj
index 73d76fc..946cf59 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class1_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_d.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_d.csproj
index 8acab8f..55a1fa4 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_do.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_do.csproj
index aeb7497..3e27427 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_r.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_r.csproj
index c24bbc8..8989a05 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj
index f48821a..825d370 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_il_d.ilproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_il_d.ilproj
index 6c114c6..263101e 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_il_r.ilproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_il_r.ilproj
index 1164587..8f1595f 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/class2_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj
index 2694003..f829065 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj
index a751dee..a3fa822 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj
index f3679d0..e04dd83 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj
index ee40f3c..74c0a08 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt1_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj
index 5e1224a..e63d1df 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj
index cf40b61..c7fa1fb8 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj
index bc93824..6173295 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj
index 80eef30..97de5c53 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt2_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj
index c4c275c..1f84daf 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj
index 7cb0942..accc5f6 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj
index fe22cd2..c142a5d 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj
index 65eb6f0..d524bcd 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt3_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj
index 7901160..f17328e 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj
index d1aa7f4..84ada64 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj
index 9d612d0..10a6159 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj
index 51a1909..620a011 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_il_d.ilproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_il_d.ilproj
index 721d156..bb3646c 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_il_r.ilproj b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_il_r.ilproj
index f9b330e..303631d 100644
--- a/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Generics/ConstrainedCall/vt4_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_d.csproj b/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_d.csproj
index f7a8b50..33ae25c 100644
--- a/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_d.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_d.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_do.csproj b/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_do.csproj
index ac85a95..177d900 100644
--- a/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_do.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_do.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_r.csproj b/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_r.csproj
index 3406133..2972090 100644
--- a/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_r.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_r.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_ro.csproj b/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_ro.csproj
index 83e209e..d110ada 100644
--- a/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Constraints/Call_instance01_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Generics/Constraints/call_instance01.csproj b/src/coreclr/tests/src/JIT/Generics/Constraints/call_instance01.csproj
index 7a8d91d..2c2e372 100644
--- a/src/coreclr/tests/src/JIT/Generics/Constraints/call_instance01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Constraints/call_instance01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Constraints/call_static01.csproj b/src/coreclr/tests/src/JIT/Generics/Constraints/call_static01.csproj
index ae6754e..7357bbe 100644
--- a/src/coreclr/tests/src/JIT/Generics/Constraints/call_static01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Constraints/call_static01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Constraints/convert_instance01.csproj b/src/coreclr/tests/src/JIT/Generics/Constraints/convert_instance01.csproj
index dbbc0d3..39d6d9f 100644
--- a/src/coreclr/tests/src/JIT/Generics/Constraints/convert_instance01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Constraints/convert_instance01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Constraints/convert_static01.csproj b/src/coreclr/tests/src/JIT/Generics/Constraints/convert_static01.csproj
index d176a39..eb14e8c 100644
--- a/src/coreclr/tests/src/JIT/Generics/Constraints/convert_static01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Constraints/convert_static01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Constraints/transitive_instance01.csproj b/src/coreclr/tests/src/JIT/Generics/Constraints/transitive_instance01.csproj
index c0cbf59..fc294236 100644
--- a/src/coreclr/tests/src/JIT/Generics/Constraints/transitive_instance01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Constraints/transitive_instance01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Constraints/transitive_static01.csproj b/src/coreclr/tests/src/JIT/Generics/Constraints/transitive_static01.csproj
index e989cf9..33e5d3e 100644
--- a/src/coreclr/tests/src/JIT/Generics/Constraints/transitive_static01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Constraints/transitive_static01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Conversions/Boxing/box_unbox01.csproj b/src/coreclr/tests/src/JIT/Generics/Conversions/Boxing/box_unbox01.csproj
index 54257f0..d02bdcc 100644
--- a/src/coreclr/tests/src/JIT/Generics/Conversions/Boxing/box_unbox01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Conversions/Boxing/box_unbox01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentogen01.csproj b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentogen01.csproj
index 5a82531..4cb4ee8 100644
--- a/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentogen01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentogen01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentogen02.csproj b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentogen02.csproj
index adfa356..8f668ee 100644
--- a/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentogen02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentogen02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentogen03.csproj b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentogen03.csproj
index 412b3d7..51baac1 100644
--- a/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentogen03.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentogen03.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentonongen01.csproj b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentonongen01.csproj
index d8560ec..779834e 100644
--- a/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentonongen01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentonongen01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentonongen02.csproj b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentonongen02.csproj
index 1324d2a..1e779fc 100644
--- a/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentonongen02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentonongen02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentonongen03.csproj b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentonongen03.csproj
index d94e43f..287f4c4 100644
--- a/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentonongen03.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/gentonongen03.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/nongentogen01.csproj b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/nongentogen01.csproj
index 3599de7..53c4761 100644
--- a/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/nongentogen01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/nongentogen01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/nongentogen02.csproj b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/nongentogen02.csproj
index de1a079..00fdaad 100644
--- a/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/nongentogen02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/nongentogen02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/nongentogen03.csproj b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/nongentogen03.csproj
index f74a526..8471dc9 100644
--- a/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/nongentogen03.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Conversions/Reference/nongentogen03.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Coverage/chaos55915408cs.csproj b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos55915408cs.csproj
index c19ed3c..325e861 100644
--- a/src/coreclr/tests/src/JIT/Generics/Coverage/chaos55915408cs.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos55915408cs.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Coverage/chaos55915408cs_o.csproj b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos55915408cs_o.csproj
index b8eb8d8..1277ddc 100644
--- a/src/coreclr/tests/src/JIT/Generics/Coverage/chaos55915408cs_o.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos55915408cs_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Coverage/chaos56200037cs.csproj b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos56200037cs.csproj
index b86c2f9..473aba8 100644
--- a/src/coreclr/tests/src/JIT/Generics/Coverage/chaos56200037cs.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos56200037cs.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Coverage/chaos56200037cs_o.csproj b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos56200037cs_o.csproj
index 3a1cc42..e037025 100644
--- a/src/coreclr/tests/src/JIT/Generics/Coverage/chaos56200037cs_o.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos56200037cs_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj
index 2ec6423..6fab1c9 100644
--- a/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj
index 5bdbb2e..8bb646e 100644
--- a/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Coverage/chaos65204782cs_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Exceptions/general_class_instance01.csproj b/src/coreclr/tests/src/JIT/Generics/Exceptions/general_class_instance01.csproj
index cfd2a47..5954bd8 100644
--- a/src/coreclr/tests/src/JIT/Generics/Exceptions/general_class_instance01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Exceptions/general_class_instance01.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Exceptions/general_class_static01.csproj b/src/coreclr/tests/src/JIT/Generics/Exceptions/general_class_static01.csproj
index f17654e..e604b60 100644
--- a/src/coreclr/tests/src/JIT/Generics/Exceptions/general_class_static01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Exceptions/general_class_static01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Exceptions/general_struct_instance01.csproj b/src/coreclr/tests/src/JIT/Generics/Exceptions/general_struct_instance01.csproj
index a305929..cae633c 100644
--- a/src/coreclr/tests/src/JIT/Generics/Exceptions/general_struct_instance01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Exceptions/general_struct_instance01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Exceptions/general_struct_static01.csproj b/src/coreclr/tests/src/JIT/Generics/Exceptions/general_struct_static01.csproj
index 3f1b6ee..b8ea59f 100644
--- a/src/coreclr/tests/src/JIT/Generics/Exceptions/general_struct_static01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Exceptions/general_struct_static01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_instance01.csproj b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_instance01.csproj
index fccbe78..860762d 100644
--- a/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_instance01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_instance01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_instance02.csproj b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_instance02.csproj
index 8601a8a..3791ee2 100644
--- a/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_instance02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_instance02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_static01.csproj b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_static01.csproj
index 843f0b2..f94186a 100644
--- a/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_static01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_static01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_static02.csproj b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_static02.csproj
index 6b781a6..d78cd62 100644
--- a/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_static02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_class_static02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_instance01.csproj b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_instance01.csproj
index 05ae258..11a03d8 100644
--- a/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_instance01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_instance01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_instance02.csproj b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_instance02.csproj
index 12049bf..b4b7bad 100644
--- a/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_instance02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_instance02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_static01.csproj b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_static01.csproj
index 9677e73..711e38d 100644
--- a/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_static01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_static01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_static02.csproj b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_static02.csproj
index 6f71d05..5e9e4de 100644
--- a/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_static02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Exceptions/specific_struct_static02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj b/src/coreclr/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj
index 0da5926..fb3e21f 100644
--- a/src/coreclr/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Fields/getclassfrommethodparam.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Generics/Fields/instance_assignment_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Fields/instance_assignment_class01.csproj
index a986f57..976dc6a 100644
--- a/src/coreclr/tests/src/JIT/Generics/Fields/instance_assignment_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Fields/instance_assignment_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Fields/instance_assignment_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Fields/instance_assignment_struct01.csproj
index b0cf155..26ead6b 100644
--- a/src/coreclr/tests/src/JIT/Generics/Fields/instance_assignment_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Fields/instance_assignment_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Fields/instance_equalnull_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Fields/instance_equalnull_class01.csproj
index e18d522..25bc9d7 100644
--- a/src/coreclr/tests/src/JIT/Generics/Fields/instance_equalnull_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Fields/instance_equalnull_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Fields/instance_equalnull_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Fields/instance_equalnull_struct01.csproj
index 9418367..523eb9a 100644
--- a/src/coreclr/tests/src/JIT/Generics/Fields/instance_equalnull_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Fields/instance_equalnull_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Fields/instance_passing_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Fields/instance_passing_class01.csproj
index aeb71eb..9b1c681 100644
--- a/src/coreclr/tests/src/JIT/Generics/Fields/instance_passing_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Fields/instance_passing_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Fields/instance_passing_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Fields/instance_passing_struct01.csproj
index 4c93829..cc55292 100644
--- a/src/coreclr/tests/src/JIT/Generics/Fields/instance_passing_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Fields/instance_passing_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Fields/static_assignment_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Fields/static_assignment_class01.csproj
index d040723..5665b6a 100644
--- a/src/coreclr/tests/src/JIT/Generics/Fields/static_assignment_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Fields/static_assignment_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Fields/static_assignment_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Fields/static_assignment_struct01.csproj
index 1e614a8..afbfbb6 100644
--- a/src/coreclr/tests/src/JIT/Generics/Fields/static_assignment_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Fields/static_assignment_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Fields/static_equalnull_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Fields/static_equalnull_class01.csproj
index d956c88..747f190 100644
--- a/src/coreclr/tests/src/JIT/Generics/Fields/static_equalnull_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Fields/static_equalnull_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Fields/static_equalnull_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Fields/static_equalnull_struct01.csproj
index 79dcad3..3254c54 100644
--- a/src/coreclr/tests/src/JIT/Generics/Fields/static_equalnull_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Fields/static_equalnull_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Fields/static_passing_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Fields/static_passing_class01.csproj
index 05afe2e..3b35d89 100644
--- a/src/coreclr/tests/src/JIT/Generics/Fields/static_passing_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Fields/static_passing_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Fields/static_passing_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Fields/static_passing_struct01.csproj
index 2395c32..72ae7f7 100644
--- a/src/coreclr/tests/src/JIT/Generics/Fields/static_passing_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Fields/static_passing_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass01.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass01.csproj
index 8427c2c..d1ef2b5 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass02.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass02.csproj
index 4135271..488bf85 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass03.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass03.csproj
index beab0c4..6e1b237 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass03.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass03.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass04.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass04.csproj
index 8ab97f8..2e7bd5d 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass04.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass04.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass05.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass05.csproj
index b8e61aa..a6879db 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass05.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/baseclass05.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/class01.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/class01.csproj
index 40eefd7..b8817e8 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/class02.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/class02.csproj
index 1245f12..e2de8b4 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/class02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/class02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/class03.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/class03.csproj
index 306ec2a..bdba394 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/class03.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Classes/class03.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class01.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class01.csproj
index bd9bb1c..c6b76c8 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class02.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class02.csproj
index 6147c07..cc51e64 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class03.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class03.csproj
index e195d91..3d1334e 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class03.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class03.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class04.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class04.csproj
index affb98f..a62ea8d 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class04.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class04.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class05.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class05.csproj
index af87e28..8af051f 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class05.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/class05.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct01.csproj
index df8b352..e7ded39 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct02.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct02.csproj
index 0f32194..770ca50 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct03.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct03.csproj
index a702c28..83527b9 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct03.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct03.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct04.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct04.csproj
index 519ec6b..ebc5941 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct04.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct04.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct05.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct05.csproj
index a0cd096..8855f9f 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct05.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Interfaces/struct05.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Structs/struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Structs/struct01.csproj
index 9281f4e..ae539f6 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Structs/struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Structs/struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Structs/struct02.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Structs/struct02.csproj
index c9ca994..f577b28 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Structs/struct02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Structs/struct02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/Structs/struct03.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/Structs/struct03.csproj
index 2d82a3a..9b75874 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/Structs/struct03.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/Structs/struct03.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate001.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate001.csproj
index 5b16f07..cc9b086 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate001.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate001.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate002.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate002.csproj
index a9536d1..6862d24 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate002.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate002.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate003.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate003.csproj
index 4d10881..bccacaf 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate003.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate003.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate004.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate004.csproj
index 4b16378..375f41a 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate004.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate004.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate005.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate005.csproj
index e5b2ef5..7e9009f 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate005.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate005.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate006.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate006.csproj
index 09b4b24..30a72d1 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate006.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate006.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate007.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate007.csproj
index 087bd50..625ae8a 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate007.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate007.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate008.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate008.csproj
index f2d5436..e8d8091 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate008.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate008.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate009.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate009.csproj
index 29f2d8e..e8af3de 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate009.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate009.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate010.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate010.csproj
index 107e0df..3898656 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate010.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate010.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate011.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate011.csproj
index e6b9efc..4a54157 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate011.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate011.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate012.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate012.csproj
index b881fef..4ca4f70 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate012.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate012.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate013.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate013.csproj
index 45c326a..c03fca2 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate013.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate013.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate014.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate014.csproj
index ca01d8f..3dbcff8 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate014.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate014.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate015.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate015.csproj
index 0398ff0..f5b0094 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate015.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate015.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate016.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate016.csproj
index 74bcbf6..8964826 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate016.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate016.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate017.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate017.csproj
index 1639d9e..122f0af 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate017.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate017.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate018.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate018.csproj
index dce9bd9..eff87d0 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate018.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate018.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate019.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate019.csproj
index 3f161f5..cbcd0f6 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate019.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate019.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate020.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate020.csproj
index f1f5808..0bdba5e 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate020.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate020.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate021.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate021.csproj
index 6844377..d2bd055 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate021.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate021.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate022.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate022.csproj
index 6cf09ae..b78ade6 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate022.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate022.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate023.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate023.csproj
index 53d10ac..2a0695b 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate023.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate023.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate024.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate024.csproj
index b6146cb..c3a5cee 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate024.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate024.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate025.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate025.csproj
index a7e85bf..523a196 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate025.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate025.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate026.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate026.csproj
index 186d53e..c7ffb46 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate026.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate026.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate027.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate027.csproj
index 348597b..71aabe0 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate027.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate027.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate028.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate028.csproj
index 8f0e503..4d66a8f 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate028.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate028.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate029.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate029.csproj
index 11afce7..fd2fedf 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate029.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate029.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate030.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate030.csproj
index 5c44f71..a764a65 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate030.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate030.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate031.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate031.csproj
index 1806d4d..d207127 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate031.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate031.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate032.csproj b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate032.csproj
index f13e603..6d72998 100644
--- a/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate032.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Instantiation/delegates/Delegate032.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Locals/instance_assignment_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Locals/instance_assignment_class01.csproj
index c9570b9..a94aebc 100644
--- a/src/coreclr/tests/src/JIT/Generics/Locals/instance_assignment_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Locals/instance_assignment_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Locals/instance_assignment_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Locals/instance_assignment_struct01.csproj
index 4fe8096..7a31c19 100644
--- a/src/coreclr/tests/src/JIT/Generics/Locals/instance_assignment_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Locals/instance_assignment_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Locals/instance_equalnull_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Locals/instance_equalnull_class01.csproj
index d065d27..5172b6e 100644
--- a/src/coreclr/tests/src/JIT/Generics/Locals/instance_equalnull_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Locals/instance_equalnull_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Locals/instance_equalnull_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Locals/instance_equalnull_struct01.csproj
index 0392c19..a454676 100644
--- a/src/coreclr/tests/src/JIT/Generics/Locals/instance_equalnull_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Locals/instance_equalnull_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Locals/instance_passing_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Locals/instance_passing_class01.csproj
index fd0b219..56268a7 100644
--- a/src/coreclr/tests/src/JIT/Generics/Locals/instance_passing_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Locals/instance_passing_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Locals/instance_passing_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Locals/instance_passing_struct01.csproj
index ea556ff..7aef9d6 100644
--- a/src/coreclr/tests/src/JIT/Generics/Locals/instance_passing_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Locals/instance_passing_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Locals/static_assignment_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Locals/static_assignment_class01.csproj
index bbdc5cd..45f62ad 100644
--- a/src/coreclr/tests/src/JIT/Generics/Locals/static_assignment_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Locals/static_assignment_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Locals/static_assignment_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Locals/static_assignment_struct01.csproj
index 6f47773..4ef1f2e 100644
--- a/src/coreclr/tests/src/JIT/Generics/Locals/static_assignment_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Locals/static_assignment_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Locals/static_equalnull_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Locals/static_equalnull_class01.csproj
index b747f1b..56ea04a 100644
--- a/src/coreclr/tests/src/JIT/Generics/Locals/static_equalnull_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Locals/static_equalnull_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Locals/static_equalnull_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Locals/static_equalnull_struct01.csproj
index 3b857be..fca4a21 100644
--- a/src/coreclr/tests/src/JIT/Generics/Locals/static_equalnull_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Locals/static_equalnull_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Locals/static_passing_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Locals/static_passing_class01.csproj
index 25bcade..fb92dc3 100644
--- a/src/coreclr/tests/src/JIT/Generics/Locals/static_passing_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Locals/static_passing_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Locals/static_passing_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Locals/static_passing_struct01.csproj
index 0970de7..37e9ee0 100644
--- a/src/coreclr/tests/src/JIT/Generics/Locals/static_passing_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Locals/static_passing_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/MemberAccess/class_instance01.csproj b/src/coreclr/tests/src/JIT/Generics/MemberAccess/class_instance01.csproj
index 5c89e71..f9e7e17 100644
--- a/src/coreclr/tests/src/JIT/Generics/MemberAccess/class_instance01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/MemberAccess/class_instance01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/MemberAccess/class_static01.csproj b/src/coreclr/tests/src/JIT/Generics/MemberAccess/class_static01.csproj
index 0291ff6..d032771 100644
--- a/src/coreclr/tests/src/JIT/Generics/MemberAccess/class_static01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/MemberAccess/class_static01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_class01.csproj b/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_class01.csproj
index a40bf0f..5b950d9 100644
--- a/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_class02.csproj b/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_class02.csproj
index 9697b4f..854d7d2 100644
--- a/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_class02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_class02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_struct01.csproj
index d8cd39f..ad88ef7 100644
--- a/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_struct02.csproj b/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_struct02.csproj
index c3f669d..5bb1ce5 100644
--- a/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_struct02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/MemberAccess/interface_struct02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/MemberAccess/struct_instance01.csproj b/src/coreclr/tests/src/JIT/Generics/MemberAccess/struct_instance01.csproj
index 8104bac..1acd273 100644
--- a/src/coreclr/tests/src/JIT/Generics/MemberAccess/struct_instance01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/MemberAccess/struct_instance01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/MemberAccess/struct_static01.csproj b/src/coreclr/tests/src/JIT/Generics/MemberAccess/struct_static01.csproj
index a3d7cba..9370d26 100644
--- a/src/coreclr/tests/src/JIT/Generics/MemberAccess/struct_static01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/MemberAccess/struct_static01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Parameters/instance_assignment_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Parameters/instance_assignment_class01.csproj
index 933efd4..f1a7e27 100644
--- a/src/coreclr/tests/src/JIT/Generics/Parameters/instance_assignment_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Parameters/instance_assignment_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Parameters/instance_assignment_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Parameters/instance_assignment_struct01.csproj
index 96f104f..7e60492 100644
--- a/src/coreclr/tests/src/JIT/Generics/Parameters/instance_assignment_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Parameters/instance_assignment_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Parameters/instance_equalnull_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Parameters/instance_equalnull_class01.csproj
index caa0d23..acd35c8 100644
--- a/src/coreclr/tests/src/JIT/Generics/Parameters/instance_equalnull_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Parameters/instance_equalnull_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Parameters/instance_equalnull_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Parameters/instance_equalnull_struct01.csproj
index ec0a702..9dd6d41 100644
--- a/src/coreclr/tests/src/JIT/Generics/Parameters/instance_equalnull_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Parameters/instance_equalnull_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Parameters/instance_passing_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Parameters/instance_passing_class01.csproj
index 6d1d894..6e56c63 100644
--- a/src/coreclr/tests/src/JIT/Generics/Parameters/instance_passing_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Parameters/instance_passing_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Parameters/instance_passing_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Parameters/instance_passing_struct01.csproj
index b888a17..0fe358e 100644
--- a/src/coreclr/tests/src/JIT/Generics/Parameters/instance_passing_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Parameters/instance_passing_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Parameters/static_assignment_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Parameters/static_assignment_class01.csproj
index fc5b9fe..eebf6c3 100644
--- a/src/coreclr/tests/src/JIT/Generics/Parameters/static_assignment_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Parameters/static_assignment_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Parameters/static_assignment_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Parameters/static_assignment_struct01.csproj
index 9ccf425..bde0112 100644
--- a/src/coreclr/tests/src/JIT/Generics/Parameters/static_assignment_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Parameters/static_assignment_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Parameters/static_equalnull_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Parameters/static_equalnull_class01.csproj
index c0f5318..25fef68 100644
--- a/src/coreclr/tests/src/JIT/Generics/Parameters/static_equalnull_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Parameters/static_equalnull_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Parameters/static_equalnull_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Parameters/static_equalnull_struct01.csproj
index 938b425..cf6a120 100644
--- a/src/coreclr/tests/src/JIT/Generics/Parameters/static_equalnull_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Parameters/static_equalnull_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Parameters/static_passing_class01.csproj b/src/coreclr/tests/src/JIT/Generics/Parameters/static_passing_class01.csproj
index bf13d4c..4e8f7bb 100644
--- a/src/coreclr/tests/src/JIT/Generics/Parameters/static_passing_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Parameters/static_passing_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Parameters/static_passing_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Parameters/static_passing_struct01.csproj
index 418cd31..a8237d2 100644
--- a/src/coreclr/tests/src/JIT/Generics/Parameters/static_passing_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Parameters/static_passing_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/TypeParameters/default_class01.csproj b/src/coreclr/tests/src/JIT/Generics/TypeParameters/default_class01.csproj
index 85175fd..96cb392 100644
--- a/src/coreclr/tests/src/JIT/Generics/TypeParameters/default_class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/TypeParameters/default_class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/TypeParameters/default_struct01.csproj b/src/coreclr/tests/src/JIT/Generics/TypeParameters/default_struct01.csproj
index cc8b9fd..e8eeec4 100644
--- a/src/coreclr/tests/src/JIT/Generics/TypeParameters/default_struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/TypeParameters/default_struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Typeof/class01.csproj b/src/coreclr/tests/src/JIT/Generics/Typeof/class01.csproj
index 6d04da6..d140c28 100644
--- a/src/coreclr/tests/src/JIT/Generics/Typeof/class01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Typeof/class01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Typeof/class02.csproj b/src/coreclr/tests/src/JIT/Generics/Typeof/class02.csproj
index d607673..c38dc9d 100644
--- a/src/coreclr/tests/src/JIT/Generics/Typeof/class02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Typeof/class02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Typeof/class03.csproj b/src/coreclr/tests/src/JIT/Generics/Typeof/class03.csproj
index 1863103..d110598 100644
--- a/src/coreclr/tests/src/JIT/Generics/Typeof/class03.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Typeof/class03.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Typeof/dynamicTypes.csproj b/src/coreclr/tests/src/JIT/Generics/Typeof/dynamicTypes.csproj
index 0fd8a5a..ac200f1 100644
--- a/src/coreclr/tests/src/JIT/Generics/Typeof/dynamicTypes.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Typeof/dynamicTypes.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Typeof/objectBoxing.csproj b/src/coreclr/tests/src/JIT/Generics/Typeof/objectBoxing.csproj
index 34d3ab4..7f502b6 100644
--- a/src/coreclr/tests/src/JIT/Generics/Typeof/objectBoxing.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Typeof/objectBoxing.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Typeof/refTypesdynamic.csproj b/src/coreclr/tests/src/JIT/Generics/Typeof/refTypesdynamic.csproj
index 20b1e41..a68ca28 100644
--- a/src/coreclr/tests/src/JIT/Generics/Typeof/refTypesdynamic.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Typeof/refTypesdynamic.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/Typeof/struct01.csproj b/src/coreclr/tests/src/JIT/Generics/Typeof/struct01.csproj
index 44e2ef6..bfad9ec 100644
--- a/src/coreclr/tests/src/JIT/Generics/Typeof/struct01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Typeof/struct01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Typeof/struct02.csproj b/src/coreclr/tests/src/JIT/Generics/Typeof/struct02.csproj
index 4e42e4d..b046fb5 100644
--- a/src/coreclr/tests/src/JIT/Generics/Typeof/struct02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Typeof/struct02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Typeof/struct03.csproj b/src/coreclr/tests/src/JIT/Generics/Typeof/struct03.csproj
index 64074ec..fc24790 100644
--- a/src/coreclr/tests/src/JIT/Generics/Typeof/struct03.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Typeof/struct03.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/Typeof/valueTypeBoxing.csproj b/src/coreclr/tests/src/JIT/Generics/Typeof/valueTypeBoxing.csproj
index db5429b..39d2a07 100644
--- a/src/coreclr/tests/src/JIT/Generics/Typeof/valueTypeBoxing.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/Typeof/valueTypeBoxing.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Generics/pinvoke/instance01.csproj b/src/coreclr/tests/src/JIT/Generics/pinvoke/instance01.csproj
index 03cef53..13d44c3 100644
--- a/src/coreclr/tests/src/JIT/Generics/pinvoke/instance01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/pinvoke/instance01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/pinvoke/instance02.csproj b/src/coreclr/tests/src/JIT/Generics/pinvoke/instance02.csproj
index 086b067..99aef9f 100644
--- a/src/coreclr/tests/src/JIT/Generics/pinvoke/instance02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/pinvoke/instance02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/pinvoke/instance03.csproj b/src/coreclr/tests/src/JIT/Generics/pinvoke/instance03.csproj
index 94ec0fb..8e5ee89 100644
--- a/src/coreclr/tests/src/JIT/Generics/pinvoke/instance03.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/pinvoke/instance03.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/pinvoke/static01.csproj b/src/coreclr/tests/src/JIT/Generics/pinvoke/static01.csproj
index f25591a..1661728 100644
--- a/src/coreclr/tests/src/JIT/Generics/pinvoke/static01.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/pinvoke/static01.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Generics/pinvoke/static02.csproj b/src/coreclr/tests/src/JIT/Generics/pinvoke/static02.csproj
index 8eb9abf..776abee 100644
--- a/src/coreclr/tests/src/JIT/Generics/pinvoke/static02.csproj
+++ b/src/coreclr/tests/src/JIT/Generics/pinvoke/static02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/add_ovf.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/add_ovf.ilproj
index 6e3422f..ef35b69 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/add_ovf.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/add_ovf.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/and.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/and.ilproj
index b3e0c41..bc7fcfd 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/and.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/and.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/beq.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/beq.ilproj
index 922b8fd..6c535e2 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/beq.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/beq.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/beq_s.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/beq_s.ilproj
index d42b6d7..ea774ec 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/beq_s.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/beq_s.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bge.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bge.ilproj
index 9b34109..1a083c9 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bge.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bge.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bge_s.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bge_s.ilproj
index 3a2e734..3750c12 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bge_s.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bge_s.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bgt.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bgt.ilproj
index dbda065..b3d36d1 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bgt.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bgt.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bgt_s.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bgt_s.ilproj
index 4a247c9..23ebdac 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bgt_s.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bgt_s.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ble.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ble.ilproj
index 060008b..a5a0c09 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ble.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ble.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ble_s.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ble_s.ilproj
index b41e4f1..be98ace 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ble_s.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ble_s.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/blt.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/blt.ilproj
index ca16449..ad74681 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/blt.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/blt.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/blt_s.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/blt_s.ilproj
index 4fbdd66..1817c02 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/blt_s.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/blt_s.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bne.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bne.ilproj
index dde9d34..319aa08 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bne.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bne.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bne_s.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bne_s.ilproj
index 1a1e927..de4d567 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bne_s.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/bne_s.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/br.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/br.ilproj
index aa0f712..6e0b9ae 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/br.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/br.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/br_s.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/br_s.ilproj
index d239988..2add155 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/br_s.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/br_s.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brfalse.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brfalse.ilproj
index f631a2e..fc805b7 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brfalse.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brfalse.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brfalse_s.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brfalse_s.ilproj
index ce6e939..ab905c9 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brfalse_s.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brfalse_s.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brtrue.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brtrue.ilproj
index c4efc54..139373e 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brtrue.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brtrue.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brtrue_s.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brtrue_s.ilproj
index b82829e..57dadae 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brtrue_s.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/brtrue_s.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/call.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/call.ilproj
index dec4288..2b13204 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/call.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/call.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ceq.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ceq.ilproj
index 5ba5ccf..ea7d0df 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ceq.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ceq.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/cgt.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/cgt.ilproj
index 321d6fa..4626bb4 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/cgt.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/cgt.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ckfinite.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ckfinite.ilproj
index 1b22e04..b586be7 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ckfinite.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ckfinite.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/clt.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/clt.ilproj
index 2741b98..fb06db3 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/clt.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/clt.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/conv.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/conv.ilproj
index 11f9bf8..e6dd1fe1 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/conv.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/conv.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/conv_ovf.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/conv_ovf.ilproj
index 6131ecf..5275015 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/conv_ovf.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/conv_ovf.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/cpblk.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/cpblk.ilproj
index f7871b4..b45d86e 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/cpblk.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/cpblk.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/div.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/div.ilproj
index 49a502d..f7f84d3 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/div.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/div.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/dup.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/dup.ilproj
index f25f56b..6802f53 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/dup.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/dup.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/initblk.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/initblk.ilproj
index 102bbef..49165bb 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/initblk.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/initblk.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/jmp.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/jmp.ilproj
index 4033236..3b2e32b 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/jmp.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/jmp.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldarg_n.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldarg_n.ilproj
index 32db8d09..52a0fdb 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldarg_n.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldarg_n.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldarg_starg.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldarg_starg.ilproj
index 69cfe4e..8026218 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldarg_starg.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldarg_starg.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldargs_stargs.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldargs_stargs.ilproj
index e5982fb..735a4b7 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldargs_stargs.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldargs_stargs.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldc.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldc.ilproj
index 8344229..42bfc01 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldc.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldc.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldc_i4_n.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldc_i4_n.ilproj
index 2795a54..40ffc22 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldc_i4_n.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldc_i4_n.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldftn_calli.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldftn_calli.ilproj
index e953275..a120567 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldftn_calli.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldftn_calli.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldind_stind.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldind_stind.ilproj
index ad63374..6d05885 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldind_stind.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldind_stind.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldloc_stloc.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldloc_stloc.ilproj
index 92b4194..7e7d957 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldloc_stloc.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldloc_stloc.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldloca.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldloca.ilproj
index 82ad887..2d0cd34 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldloca.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldloca.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldnull.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldnull.ilproj
index de686ed..a9467d3 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldnull.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ldnull.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/mul.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/mul.ilproj
index 0c784d2..4dc0ff0 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/mul.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/mul.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/mul_ovf.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/mul_ovf.ilproj
index f57ed75..aea1fb4 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/mul_ovf.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/mul_ovf.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/neg.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/neg.ilproj
index 4382ff6..c048156 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/neg.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/neg.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/nop.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/nop.ilproj
index ff2d0e5..6e54e2d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/nop.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/nop.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/not.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/not.ilproj
index 9da7739..5e7c1f4 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/not.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/not.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/or.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/or.ilproj
index 9c5d2b2..dae82f3 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/or.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/or.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/pop.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/pop.ilproj
index 59aedc4..13e2cda 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/pop.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/pop.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/rem.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/rem.ilproj
index 0c3f890..1d1106c 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/rem.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/rem.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ret.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ret.ilproj
index 1752479..4ef62fe 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ret.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/ret.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/shl.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/shl.ilproj
index 3928a60..8646241 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/shl.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/shl.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/shr.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/shr.ilproj
index 3026e7f..fbfd371 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/shr.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/shr.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/sub.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/sub.ilproj
index 020c1b4..1a50b2e 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/sub.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/sub.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/sub_ovf.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/sub_ovf.ilproj
index 4b021bb..99cff39 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/sub_ovf.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/sub_ovf.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/switch.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/switch.ilproj
index 59d6fd3..074b164 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/switch.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/switch.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/tailcall.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/tailcall.ilproj
index 5c25947..49b4005 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/tailcall.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/tailcall.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/unaligned.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/unaligned.ilproj
index fa98991..a90c27c 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/unaligned.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/unaligned.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/volatile.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/volatile.ilproj
index 7737990..6081e6b 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/volatile.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/volatile.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/xor.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/xor.ilproj
index 18d7006..53bd609 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/xor.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Base/xor.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ConvDLL.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ConvDLL.ilproj
index 93ea811..67d9357 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ConvDLL.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ConvDLL.ilproj
@@ -37,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/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I4.ilproj
index f4e4931..f07edd6 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I8.ilproj
index ee3f4f1..ea3953c 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_I8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_R4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_R4.ilproj
index 0736af1..11c3138 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_R4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/Conv_R4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_I4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_I4.ilproj
index 00ff671..b14c7ee 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_I4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_I4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i.ilproj
index e604fad..250d9db 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i8.ilproj
index 1037bb3..3cebb50 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i1.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i1.ilproj
index 7d635c7..f89941c 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i1.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i1.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i2.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i2.ilproj
index 1a0d030..0346e4d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i2.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i2.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i4.ilproj
index 3364f6c..531bfed 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i8.ilproj
index 6a79931..f7a23e0 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u1.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u1.ilproj
index d67b20c..18ccb7a 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u1.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u1.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u2.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u2.ilproj
index 1276c0d..5713899 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u2.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u2.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u4.ilproj
index a7e87ca..2ea7214 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u8.ilproj
index 6b44e1e..3fe8053 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_ovf_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r4.ilproj
index 32dd25f..40fefe4 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r8.ilproj
index fc80c89..7e0115b 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/add_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u4.ilproj
index c184e7f..d9ef42a 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u8.ilproj
index 4706984..f1180f3 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/and_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i.ilproj
index 2034c1f..b0ee119 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i4.ilproj
index 24feccf..16ab9a3 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i8.ilproj
index 67d4c4b..8beb90d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r4.ilproj
index ff17b7c..f7c8709 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r4.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="ConvDLL.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r8.ilproj
index eea6d25..bf83bc8 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/beq_r8.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="ConvDLL.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i4.ilproj
index 44a03f0..5b6bddc 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i8.ilproj
index 35444d3..3a9f207 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r4.ilproj
index 52458f3..ceb98b7 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r4.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="ConvDLL.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r8.ilproj
index b865b68..4129b40 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_r8.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="ConvDLL.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_u.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_u.ilproj
index ff8224b..c994cdf 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_u.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_u.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i4.ilproj
index 6370369..9aa1519 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i8.ilproj
index cc274a6..39058e4 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r4.ilproj
index 2191a78..ea04b23 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r4.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="ConvDLL.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r8.ilproj
index 34014e3..975f37e 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bge_un_r8.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="ConvDLL.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i4.ilproj
index 6128aea..8bf139d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i8.ilproj
index f6dc541..732219b 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r4.ilproj
index a658083..292d074 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r8.ilproj
index 490e029..b5873a8 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u.ilproj
index 92b7283..1d12181 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u4.ilproj
index 0ea838f..2151825 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u8.ilproj
index f14e212..ee3df72 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r4.ilproj
index 3e9ff74..bbe1e87 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r8.ilproj
index 44d92f0..254d1c7 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bgt_un_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i4.ilproj
index 5774e3e..9e0e59e 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i8.ilproj
index e332843..fca3744 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r4.ilproj
index 2bd8ab2..ba78908 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r8.ilproj
index 45b786d..584a11f 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u.ilproj
index 257e266..1509805 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u4.ilproj
index 9ae4f088..d9088aa 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u8.ilproj
index 86080d4..f4a8056 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r4.ilproj
index 6078d95..3812245 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r8.ilproj
index e9f1952..1bb9910 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ble_un_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i4.ilproj
index 7ddee84..18290c5 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i8.ilproj
index 2c0c87e..5c7c53e 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r4.ilproj
index 787988c..a2b46a7 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r8.ilproj
index 5470103..cbb74d7 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u.ilproj
index 91cfc14..34161417 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u4.ilproj
index 5bf8fb4..9223f57 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u8.ilproj
index 7606d29..3e28c61 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r4.ilproj
index 5b7ed1b..d97ef20 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r8.ilproj
index b6faa46..26a5b83 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/blt_un_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u.ilproj
index 21a58bc..8e60c3a 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u4.ilproj
index e8b79df..c67572c 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u8.ilproj
index a56d5a4..726a808 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r4.ilproj
index c960711..ecf09d5 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r8.ilproj
index 6745e5d..e209942 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/bne_un_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/br.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/br.ilproj
index aa0f712..6e0b9ae 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/br.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/br.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brfalse.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brfalse.ilproj
index f631a2e..fc805b7 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brfalse.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brfalse.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brtrue.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brtrue.ilproj
index c4efc54..139373e 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brtrue.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/brtrue.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_br.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_br.ilproj
index 934365e..9a2410e 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_br.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_br.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brfalse.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brfalse.ilproj
index 39e803e..567d99a 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brfalse.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brfalse.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brtrue.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brtrue.ilproj
index c420f8d..a74c5e7 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brtrue.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_brtrue.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_call.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_call.ilproj
index 678aac8..ee11ff7 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_call.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_call.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_cpblk.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_cpblk.ilproj
index 33f6731..6dad2f6 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_cpblk.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_cpblk.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_initblk.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_initblk.ilproj
index 80af525..b273c04 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_initblk.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_initblk.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ldvirtftn.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ldvirtftn.ilproj
index 7867d95..3bf0952 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ldvirtftn.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ldvirtftn.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_localloc.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_localloc.ilproj
index 8c1aebc..5c050f4 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_localloc.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_localloc.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_nop.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_nop.ilproj
index 8ddd775..9a3e648 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_nop.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_nop.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ret.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ret.ilproj
index 63f445a..3cb15ba 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ret.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_ret.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_switch.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_switch.ilproj
index 9a6deee..c808183 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_switch.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/c_switch.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/call.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/call.ilproj
index dec4288..2b13204 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/call.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/call.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i.ilproj
index f844462..9a83ad5 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i4.ilproj
index 3487fcc..84d6d9d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i8.ilproj
index 4374324..5cb8fa2 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r4.ilproj
index 4a4415d..5f5e183 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r8.ilproj
index 9ff68a3..0eda356 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ceq_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i4.ilproj
index 700e00c..12e3e1c 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i8.ilproj
index 2daf8f3..831680a 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r4.ilproj
index 963dcc5..60871c2 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r8.ilproj
index fb1864d..d014f52 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u.ilproj
index dcb942a..18a7215 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u4.ilproj
index ce9200d..5a6521d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u8.ilproj
index a6bd27d..59090cb 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r4.ilproj
index 7b073a3..3d62810 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r8.ilproj
index 0e2600f..4faf2fb 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cgt_un_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r4.ilproj
index 5617612..86be1c1 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r8.ilproj
index 3d3357b..bb53f68 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ckfinite_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i4.ilproj
index 7f12da5..b8cbaec4 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i8.ilproj
index 8526b9b..bf02e2d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r4.ilproj
index 5ed9d0f..161f261 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r8.ilproj
index 96dde55..718c0a3 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u.ilproj
index 4e2e52b..85b192f 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u4.ilproj
index 807fbe3..1f24503 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u8.ilproj
index 8274392..6fcd686 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r4.ilproj
index 05c2799..3ea0df1 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r8.ilproj
index 8e139ec..ef71a01 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/clt_un_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i1.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i1.ilproj
index 669822f..6537fc4 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i1.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i1.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i2.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i2.ilproj
index 0c9ce63..9df8d08 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i2.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_i2.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_u4.ilproj
index 323828c..dab8248 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i4_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj
index f3666b4..0cb194d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <DisableProjectBuild Condition="'$(Platform)' == 'x64'">true</DisableProjectBuild>
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i4.ilproj
index 11ffca2..1e8e3a3 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_u8.ilproj
index 16a8f41..b2f01fe 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_i8_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i.ilproj
index 683fb5f..195254b 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i4.ilproj
index 3a3d31c..6e42f5b 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i8.ilproj
index 20a2b5d..aef7ce66 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_r8_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i.ilproj
index d1e9b782..4603391 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i4.ilproj
index 509bf13..2f5f789 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u1.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u1.ilproj
index 737635e..754593f 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u1.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u1.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u2.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u2.ilproj
index 8e3e4cd..8cebbad 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u2.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u4_u2.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_i8.ilproj
index 89fb64c..f8cefdb 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_u4.ilproj
index 71a7a42..e9357a6 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/conv_ovf_u8_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cpblk.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cpblk.ilproj
index f7871b4..b45d86e 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cpblk.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/cpblk.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i4.ilproj
index fb8eac8..45038dc 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i8.ilproj
index fa55c0c..b11e493 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r4.ilproj
index f6d2812..84f301e 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r8.ilproj
index 2e17ba8..6553b4b 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u4.ilproj
index d719387..f79466a 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u8.ilproj
index 09aff72..4a6e83e 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/div_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup4.ilproj
index 2ab47e4..7079d62 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup8.ilproj
index 06258e4..5c8b58d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dup8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dupi.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dupi.ilproj
index 3c7483e..3347545 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dupi.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/dupi.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/initblk.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/initblk.ilproj
index 102bbef..49165bb 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/initblk.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/initblk.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i.ilproj
index e6ea296..a739f60 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i4.ilproj
index 7ecec1f..b30f21b 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i8.ilproj
index e88a9d2..d5e6cc1 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r4.ilproj
index da80396..7eac6f4 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r8.ilproj
index d44dd65..d39f1d9 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_ref.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_ref.ilproj
index 0ced838..3470497 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_ref.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarg_ref.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i.ilproj
index d5d20d6..3c3990f 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i4.ilproj
index 9c9a63b..aee2e80 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i8.ilproj
index 2147ead..c5e63d6 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r4.ilproj
index 46ca86f..83ca497 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r8.ilproj
index fcd81cd..0860382 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_ref.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_ref.ilproj
index c4dde0a..872432d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_ref.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldarga_ref.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i4.ilproj
index ddc7ee9..a902ec9 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i8.ilproj
index 035ac503..64753a7c 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r4.ilproj
index 39dad0a..9bf9673 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r8.ilproj
index 414d354..69ce888 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldc_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldftn.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldftn.ilproj
index 17a411e..52ae601 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldftn.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldftn.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i.ilproj
index ebebbc8..e75b497 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i1.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i1.ilproj
index dd0d2d8..b9d3541 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i1.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i1.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i2.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i2.ilproj
index c931b64..05bc628 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i2.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i2.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i4.ilproj
index 10d5564..27bd558 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i8.ilproj
index 77cb625..7a818e0 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r4.ilproj
index 36be655..2bd7974 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r8.ilproj
index 22a8e235..5bb1982 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_ref.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_ref.ilproj
index 13cb64f..638d00f 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_ref.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_ref.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u1.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u1.ilproj
index 4c6b197..a810a8b 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u1.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u1.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u2.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u2.ilproj
index a9c4cef..1020244 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u2.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u2.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u4.ilproj
index 4ebc3c9..e07b9f2 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldind_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i.ilproj
index 2e4c5e5..2591e2b 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i4.ilproj
index ae6e078..0f285ad 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i8.ilproj
index 3c949f9..58e8041 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r4.ilproj
index 9beb785..f9fafa0 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r8.ilproj
index e784749..7689ad2 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_ref.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_ref.ilproj
index 00466b7..39ecad1 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_ref.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldloc_ref.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_i.ilproj
index 8d0c863..f5e724a 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_i.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_ref.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_ref.ilproj
index 4acccd3..1b008a6 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_ref.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldnull_ref.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldvirtftn.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldvirtftn.ilproj
index 3db1fcb..165d0e2 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldvirtftn.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ldvirtftn.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/localloc.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/localloc.ilproj
index 2046f092..b763a50 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/localloc.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/localloc.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i4.ilproj
index 49279bc..7deb489 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i8.ilproj
index 612045b..e157c7b 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i1.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i1.ilproj
index d745e5e..b54b32a 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i1.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i1.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i2.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i2.ilproj
index c2d9771..bf0c3cb 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i2.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i2.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i4.ilproj
index ab7f2c95..037f255 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i8.ilproj
index 16a8c1f..0a1e571 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u1.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u1.ilproj
index edacf16..029ccb4 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u1.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u1.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u2.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u2.ilproj
index d236cbf..f6b5d6f 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u2.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u2.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u4.ilproj
index 050e9f0..46a636c 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u8.ilproj
index 6469a87..2223a73 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_ovf_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r4.ilproj
index 4235756..49e250c 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r8.ilproj
index 06a54fc..b180bfe 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/mul_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i4.ilproj
index 386e48e..66bb129 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i8.ilproj
index 71f6ffd..3fdf0e3 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r4.ilproj
index 918323a..5f848be 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r8.ilproj
index 8732497..e0b74ec 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/neg_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/nop.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/nop.ilproj
index ff2d0e5..6e54e2d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/nop.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/nop.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u4.ilproj
index c343d11..d182cfc 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u8.ilproj
index f85c08e..e5b94e2 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/not_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u4.ilproj
index c9b346a..47b16dc 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u8.ilproj
index 1e1e451..6a6a0cd 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/or_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop4.ilproj
index 2058158..92ef27d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop8.ilproj
index 2d3a31c..bf15d87 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/pop8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/popi.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/popi.ilproj
index 63bb4aa..cbe1353 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/popi.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/popi.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/refs.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/refs.ilproj
index 3cb6885..4cd8185 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/refs.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/refs.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i4.ilproj
index 4901b32..70a9558 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i8.ilproj
index d5b32e9..d271ccd 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r4.ilproj
index ba0423d..92d7b1f 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r4.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r8.ilproj
index 78e9aea..3b80e80 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u4.ilproj
index e6fa2d0..6d3eb5f 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u8.ilproj
index 3eb42dd..84d5ea2 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/rem_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret.ilproj
index 1752479..4ef62fe 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i.ilproj
index 5cab81e..3818310 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i4.ilproj
index 9ab6233..64ac8fa 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i8.ilproj
index f7c876b..31a092a 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r4.ilproj
index cae688d..f4e93f3 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r8.ilproj
index 7972a90..230a24b 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_ref.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_ref.ilproj
index 818732a..3116019 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_ref.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/ret_ref.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u4.ilproj
index c3ca795..6d6f1b8 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u8.ilproj
index a886905..7d564ed 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shl_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i4.ilproj
index 29b870f..12dea78 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i8.ilproj
index 528bc7e..85dc37c 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u4.ilproj
index 655abdb..d6bc8ed 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u8.ilproj
index e3c16d0..97856e3 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/shr_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sizeof.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sizeof.ilproj
index f032ed1..c9358a2 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sizeof.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sizeof.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i.ilproj
index bb8311c..136dde5 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i4.ilproj
index 935a552..c983cb5 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i8.ilproj
index 7b9aafd..958f9ba 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r4.ilproj
index 205cdf3..614b4b4 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r8.ilproj
index 85a256c..24baa5a 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_ref.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_ref.ilproj
index 13fcb1e..5e24f5f 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_ref.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/starg_ref.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i1.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i1.ilproj
index 6dcd635..68adc2e 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i1.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i1.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i2.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i2.ilproj
index 32fcb91..166be48 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i2.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i2.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i4.ilproj
index a20d54b..9f15a1b 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i8.ilproj
index 0d3b42e..26c8366 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_r8.ilproj
index cd5e1c9..74a75e8 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_ref.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_ref.ilproj
index 48c77ba..483ca5d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_ref.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stind_ref.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i.ilproj
index b3efd32..9882d91 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i4.ilproj
index 58179b1..45a9a87 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i8.ilproj
index d209f42..9479559 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r4.ilproj
index 4aa0313..39dd1c6 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r8.ilproj
index e7caafe..97b129a 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_ref.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_ref.ilproj
index 2efbb24..d555556 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_ref.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/stloc_ref.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i.ilproj
index 2d21330..6236a74 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i4.ilproj
index 1420b58..fbd8ee1 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i8.ilproj
index 82025ed..044085c 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i1.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i1.ilproj
index 22244f0..8a65273 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i1.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i1.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i2.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i2.ilproj
index 011279e..5bcc6f7 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i2.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i2.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i4.ilproj
index 711edc0..01ef7ba 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i8.ilproj
index 37e6cfb..c447a14 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u1.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u1.ilproj
index 2009c19..9cc6d93 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u1.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u1.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u2.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u2.ilproj
index 0e6313e..de667dd 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u2.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u2.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u4.ilproj
index a911a6e..50e9db8 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u8.ilproj
index e4d50e6..739eb82 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_ovf_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r4.ilproj
index ef442c1..65f1445 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r8.ilproj
index 855e020..7d31827 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/sub_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/switch.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/switch.ilproj
index 59d6fd3..074b164 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/switch.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/switch.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u4.ilproj
index 2cf53fe..36003a5a2 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u8.ilproj
index c64aa4f..85df9f1 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/Conformance_Base/xor_u8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/AutoInit.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/AutoInit.ilproj
index dd1cb34..e6cd002 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/AutoInit.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/AutoInit.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/heap_ovf.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/heap_ovf.ilproj
index a081c13..9142b21 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/heap_ovf.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/heap_ovf.ilproj
@@ -36,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i1.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i1.ilproj
index f98fde9..b403244 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i1.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i1.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i2.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i2.ilproj
index ad15e9f..6e05d97 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i2.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i2.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i4.ilproj
index c7a7c15..c5e95af 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i8.ilproj
index 8849e98..3d4259e 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r4.ilproj
index d5deaad..8082c4d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r8.ilproj
index 2400968..e79d483 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldarg_s_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i1.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i1.ilproj
index 9692a08..0714eff 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i1.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i1.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i2.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i2.ilproj
index 82a6560..e2c02fb 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i2.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i2.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i4.ilproj
index 7018270..19ca3aa 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i8.ilproj
index fab3ce9..3446c20 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r4.ilproj
index bf0ca48..f2f4703 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r8.ilproj
index 9798be5..8b4d88b 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloc_s_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i1.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i1.ilproj
index 2f07a30..ce7cf2f 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i1.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i1.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i2.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i2.ilproj
index 61dc12b..c9022a6 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i2.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i2.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i4.ilproj
index f5b9d06..7f70611 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i8.ilproj
index c0ff2ab..f05136e 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_i8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r4.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r4.ilproj
index 13caa16..37e098f 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r4.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r8.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r8.ilproj
index 04eada2..8f95d7d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/directed/ldloca_s_r8.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/Box_Unbox.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/Box_Unbox.ilproj
index 8fa4d0b..70fab593 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/Box_Unbox.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/Box_Unbox.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/array_tests.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/array_tests.ilproj
index 7b59f54..09cc44f 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/array_tests.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/array_tests.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callintf.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callintf.ilproj
index 5553d86..3700a57 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callintf.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callintf.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callnonvirt.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callnonvirt.ilproj
index ed55ce2..f38479c 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callnonvirt.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callnonvirt.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callstatic.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callstatic.ilproj
index 83b9973..1c6f374 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callstatic.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callstatic.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callsuper.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callsuper.ilproj
index f6f1cfb..93910fd 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callsuper.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callsuper.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callvirt.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callvirt.ilproj
index a0a25be..783d809 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callvirt.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/callvirt.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/castclass.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/castclass.ilproj
index a06d300..fc3f87d 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/castclass.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/castclass.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/cpobj.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/cpobj.ilproj
index b1f6258..3442ebf 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/cpobj.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/cpobj.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/field_tests.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/field_tests.ilproj
index 9e4515f..f4734d3 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/field_tests.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/field_tests.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/fielda_tests.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/fielda_tests.ilproj
index 7279e19..de61722 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/fielda_tests.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/fielda_tests.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/initobj.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/initobj.ilproj
index b1749ba..dfdb732 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/initobj.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/initobj.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/isinst.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/isinst.ilproj
index 65c94fe..f716710 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/isinst.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/isinst.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldlen.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldlen.ilproj
index 029ff2d..56d91e4 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldlen.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldlen.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldobj.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldobj.ilproj
index 316cdce..a061f18 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldobj.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldobj.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldstr.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldstr.ilproj
index 4a41c1e..17ad5ef 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldstr.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldstr.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldtoken.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldtoken.ilproj
index 4a79755..1f8b9c4 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldtoken.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldtoken.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldvirtftn.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldvirtftn.ilproj
index 3db1fcb..165d0e2 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldvirtftn.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/ldvirtftn.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/localloc.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/localloc.ilproj
index 2046f092..b763a50 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/localloc.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/localloc.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/newobj.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/newobj.ilproj
index 709a01f..0eacf29 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/newobj.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/newobj.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/seh_tests.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/seh_tests.ilproj
index 0229a7d..faef87e 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/seh_tests.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/seh_tests.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/throw.ilproj b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/throw.ilproj
index 12f847c..d27b4f7 100644
--- a/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/throw.ilproj
+++ b/src/coreclr/tests/src/JIT/IL_Conformance/Old/objectmodel/throw.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_b.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_b.ilproj
index 30c2ed9..d3001c3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_b.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_b.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_i4.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_i4.ilproj
index 4ae04fa..016b658 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_i4.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_objref.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_objref.ilproj
index ad5ccdd..b6ed9a5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_objref.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_objref.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r4.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r4.ilproj
index 21af445..3c7b0d4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r4.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r8.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r8.ilproj
index 7db1ce0..d9a5d0a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_r8.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_struct.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_struct.ilproj
index 52cf804..0e4bd34 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_struct.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_struct.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_u8.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_u8.ilproj
index b944501..fe6a890 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_dbghuge_u8.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_b.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_b.ilproj
index 059101d..be6bc6f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_b.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_b.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_i4.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_i4.ilproj
index c8e85e7..6f6b1c0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_i4.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_objref.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_objref.ilproj
index 85dfac7..cd5a437 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_objref.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_objref.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r4.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r4.ilproj
index 03a7cab..b15ec07 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r4.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r8.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r8.ilproj
index abfea68..ed9363a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_r8.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_struct.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_struct.ilproj
index 1c4ccdb..14ecdcb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_struct.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_struct.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_u8.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_u8.ilproj
index 97101f9..8e74a06 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_u8.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/huge/_il_relhuge_u8.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs.csproj
index 3c5ee2f..ab5ce44 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs2.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs2.csproj
index 64967da..0447022 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbas.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbas.csproj
index c9f1d98..eab374d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbas.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbas.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbox.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbox.csproj
index a6442e8..53000cc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbox.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmax.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmax.csproj
index d5ac332..a6d7a81 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmax.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmax.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmixed.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmixed.csproj
index ceb4029..e0d0c15 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmixed.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmixed.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsval.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsval.csproj
index f1c2c45..df76e58 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsval.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsval.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsvalbox.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsvalbox.csproj
index ca1e432..b9e8d3e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsvalbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsvalbox.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcs.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcs.csproj
index 79dff94..d1d46c6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcs2.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcs2.csproj
index 5f09bd2..5bb1f2f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcs2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcs2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbas.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbas.csproj
index b17dc05..40417a6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbas.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbas.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbox.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbox.csproj
index 1fc8be6..41453f0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbox.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmax.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmax.csproj
index a4ef305..96e745a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmax.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmax.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmixed.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmixed.csproj
index 4e0fe62..d4a155a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmixed.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmixed.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsval.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsval.csproj
index 82ecc4a..811cd2e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsval.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsval.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsvalbox.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsvalbox.csproj
index 5512b8e..8bfef72 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsvalbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_rellcsvalbox.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs.csproj
index 8cfb726..dfb16e2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs2.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs2.csproj
index 498e537..d8a90c6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbas.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbas.csproj
index e921edd..0781217 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbas.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbas.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbox.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbox.csproj
index a9cadef..301fcf5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbox.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmax.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmax.csproj
index af97fd2..69bd42d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmax.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmax.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmixed.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmixed.csproj
index fcacd25..4b142aa 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmixed.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmixed.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsval.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsval.csproj
index 3b06c38..029e84c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsval.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsval.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsvalbox.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsvalbox.csproj
index 58b7990..3988809 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsvalbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsvalbox.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs.csproj
index 3680b29..60d8522 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs2.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs2.csproj
index 2e18d96..2659474 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbas.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbas.csproj
index 8459665..6c0aa30 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbas.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbas.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbox.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbox.csproj
index 8c3a5e4..676a1b9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbox.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmax.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmax.csproj
index c4cd771..3368f75 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmax.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmax.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmixed.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmixed.csproj
index a864be1..74b7b65 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmixed.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmixed.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsval.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsval.csproj
index e8dfc1d..47f5c13 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsval.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsval.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsvalbox.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsvalbox.csproj
index 85729d3..d399ba7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsvalbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsvalbox.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_dbgarrres.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_dbgarrres.csproj
index c506312..fa99e14 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_dbgarrres.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_dbgarrres.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_dbggcarr.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_dbggcarr.csproj
index 2e816fb9..be49281 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_dbggcarr.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_dbggcarr.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_dbgselfref.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_dbgselfref.csproj
index 515f834..3a16109 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_dbgselfref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_dbgselfref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbgaddress.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbgaddress.ilproj
index 4554aa2..68b49b3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbgaddress.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbgaddress.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbggcarr.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbggcarr.ilproj
index fd47856..00b7d5a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbggcarr.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbggcarr.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbgldelem_get.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbgldelem_get.ilproj
index af954f8..4287204 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbgldelem_get.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbgldelem_get.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbglength0.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbglength0.ilproj
index 03252ed..b423dde 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbglength0.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_dbglength0.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_reladdress.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_reladdress.ilproj
index 31d8471..0bef04c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_reladdress.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_reladdress.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_relarrres.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_relarrres.ilproj
index 3fd62d6..733c0d5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_relarrres.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_relarrres.ilproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_relgcarr.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_relgcarr.ilproj
index 6256a1c..e66b7a0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_relgcarr.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_relgcarr.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_relldelem_get.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_relldelem_get.ilproj
index e897968..0995105 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_relldelem_get.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_relldelem_get.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_rellength0.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_rellength0.ilproj
index d2d03af..65e6288 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_rellength0.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_il_rellength0.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_relarrres.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_relarrres.csproj
index 66234cc..ca38fc2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_relarrres.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_relarrres.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_relgcarr.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_relgcarr.csproj
index 9a3fefe..95a901e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_relgcarr.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_relgcarr.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_relselfref.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_relselfref.csproj
index badaf9d..22c6e59 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_relselfref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_relselfref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgarrres.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgarrres.csproj
index 545e6b6..b9ca5cf 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgarrres.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgarrres.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_dbggcarr.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_dbggcarr.csproj
index 5d567ee..ab8e4dd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_dbggcarr.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_dbggcarr.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgselfref.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgselfref.csproj
index 457ebd7..eb7a97b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgselfref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_dbgselfref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_relarrres.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_relarrres.csproj
index 362b192..0d414fd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_relarrres.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_relarrres.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_relgcarr.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_relgcarr.csproj
index 00eadac..28abcf3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_relgcarr.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_relgcarr.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_relselfref.csproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_relselfref.csproj
index 14024ef..419f3aa 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_relselfref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/misc/_speed_relselfref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range1.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range1.ilproj
index 72bc23a..59b4cc3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range2.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range2.ilproj
index 5e2e833..d61a45c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range2.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgfloat64_range2.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0.ilproj
index b0ab92e..ba895dd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5a.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5a.ilproj
index b4b93ea..d7d3b4c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5a.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5a.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5b.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5b.ilproj
index 8d5de8e..195863f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5b.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_0_5b.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_1.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_1.ilproj
index 5166990..ae5a7f1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_m1.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_m1.ilproj
index 04e99f3..b63c0af 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_m1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_m1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_neg_range.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_neg_range.ilproj
index e9c4226..3efbd52 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_neg_range.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_neg_range.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range1.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range1.ilproj
index d51b85a..c2d99f9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range2.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range2.ilproj
index e995416..550a325 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range2.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_dbgint32_range2.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range1.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range1.ilproj
index 82239c6..52ca643 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range2.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range2.ilproj
index 8aa3f3d..a4e3da8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range2.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relfloat64_range2.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0.ilproj
index db18a1e..846240f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5a.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5a.ilproj
index f9e598c..5a6d272 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5a.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5a.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5b.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5b.ilproj
index bc971ee..da2d994 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5b.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_0_5b.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_1.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_1.ilproj
index b5f477b..486ae24 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_m1.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_m1.ilproj
index b0433e1..4a796e5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_m1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_m1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_neg_range.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_neg_range.ilproj
index de7c2eb..c752022 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_neg_range.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_neg_range.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range1.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range1.ilproj
index 8c5431e..58e96f3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range2.ilproj b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range2.ilproj
index 5978081..0cc746f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range2.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Arrays/range/_il_relint32_range2.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj
index 54adc03..b7b6ae2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj
index 94f1115..0ea629d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj
index 88b9c94..30e8412 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj
index 02d5e78..112e479 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj
index 861e2b3..afbae33 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj
index b679277..72d930a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj
index 73b8e72..ac4b60d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj
index 9896f6c..c970651 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj
index 5c83997..b1e6a73 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj
index 7349233..136dc31 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj
index 5fc11d1..214643e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj
index 9da5c7b..f17f775 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj
index c9e1f65..2439b1a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj
index eb11c86..b760bd2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj
index 03872f3..92daea2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj
index 795385f..f0cebff 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/i8/i8flat_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj
index e65190d..274c0c5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj
index e10295d..6f32ab7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj
index c21ddc4..8bab969 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj
index e6d99dd..f6e4756 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj
index d8cb2a9..8aceee4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj
index 073eec6..b247662 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj
index bb58e59..4a6d5ed 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj
index 5018d65..ee46906 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r4/r4flat_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj
index 0aa5da0..4d1a589 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj
index fd383e7..2d7a0d8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj
index 580516b..450f971 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj
index 05305b1..8b4e093 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj
index 20606a1..8b57a01 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj
index ce95b7f..5e91a29 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj
index 1cfaff7..4c89ea7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj
index 4452da6..4fd140b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/AsgOp/r8/r8flat_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgfinally.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgfinally.ilproj
index 12799e6..673016a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgfinally.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgfinally.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbghuge_filter.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbghuge_filter.ilproj
index f1ed54a..f1a4917 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbghuge_filter.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbghuge_filter.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgjump.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgjump.ilproj
index 584a68a..1300a19 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgjump.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgjump.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocalloc.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocalloc.ilproj
index fa10e59..28cefd9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocalloc.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbglocalloc.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgsimple.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgsimple.ilproj
index 9bd5462..1ab5d94 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgsimple.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgsimple.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtailcall.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtailcall.ilproj
index 253c1f7..b8da91a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtailcall.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtailcall.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtry.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtry.ilproj
index 7617667..f18c203 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtry.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_dbgtry.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relfinally.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relfinally.ilproj
index c08aec4..c523b5d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relfinally.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relfinally.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relhuge_filter.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relhuge_filter.ilproj
index b9c193e..f3ee2d2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relhuge_filter.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relhuge_filter.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reljump.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reljump.ilproj
index c7a8893..9825a80 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reljump.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reljump.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocalloc.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocalloc.ilproj
index c8d8517..421f2e3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocalloc.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_rellocalloc.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relsimple.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relsimple.ilproj
index 5ceae3c..b2cc6b2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relsimple.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_relsimple.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltailcall.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltailcall.ilproj
index c2a3631..e62026e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltailcall.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltailcall.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltry.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltry.ilproj
index 7b0ecd5..5ee8af0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltry.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/boxunbox/_il_reltry.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_cs.csproj
index 1c954fb..2c8f8a0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_il.ilproj
index d441125..f8a6152 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_dbginstance_il.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_odbginstance_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_odbginstance_cs.csproj
index e2062b4..d48d739 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_odbginstance_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_odbginstance_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_orelinstance_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_orelinstance_cs.csproj
index dc03b3b..1543970 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_orelinstance_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_orelinstance_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_cs.csproj
index 56add9e..906473a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_il.ilproj
index f45276c..0a6d3b6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/callconv/_relinstance_il.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_cs.csproj
index f993160..c0170c4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_il.ilproj
index 9d00830..27152d4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgfibo_il.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_cs.csproj
index 4f47fd3..f9e0cad 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_il.ilproj
index 1596bd2..914cba8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_dbgsin_il.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgfibo_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgfibo_cs.csproj
index c095a79..4c6e51f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgfibo_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgfibo_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgsin_cs.csproj
index cbdf4a3..2015389 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_odbgsin_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelfibo_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelfibo_cs.csproj
index 15559fb..87dfb18 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelfibo_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelfibo_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelsin_cs.csproj
index 35a69c7..f85218a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_orelsin_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relfibo_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relfibo_cs.csproj
index b8aeecd..7e1f5e2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relfibo_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relfibo_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relfibo_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relfibo_il.ilproj
index ce95d51..819bde1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relfibo_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relfibo_il.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relsin_cs.csproj
index b60aa07..7593643 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relsin_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relsin_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relsin_il.ilproj
index 0c48b9b..fbfca01 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relsin_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/functional/_relsin_il.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgconcurgc_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgconcurgc_il.ilproj
index b9984b0..350926e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgconcurgc_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgconcurgc_il.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_cs.csproj
index 25ec5f2..d42a6ae 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgenum_cs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_cs.csproj
index 4c463ff..dddaed4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_cs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_il.ilproj
index d160121..026c12d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgnestval_il.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_cs.csproj
index 5b53d86..3dfc9fb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgtailjump_cs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgtypedref.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgtypedref.ilproj
index b22980f..730e031 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgtypedref.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_dbgtypedref.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_odbgenum_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_odbgenum_cs.csproj
index af323b4..4f80087 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_odbgenum_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_odbgenum_cs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_odbgnestval_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_odbgnestval_cs.csproj
index 8baf3e1..daf7e3b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_odbgnestval_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_odbgnestval_cs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_odbgtailjump_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_odbgtailjump_cs.csproj
index 1eff1dc..57af162 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_odbgtailjump_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_odbgtailjump_cs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_orelenum_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_orelenum_cs.csproj
index 603312e..5c56c1e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_orelenum_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_orelenum_cs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_orelnestval_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_orelnestval_cs.csproj
index 8507740..a46439f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_orelnestval_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_orelnestval_cs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_oreltailjump_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_oreltailjump_cs.csproj
index f956517..e512097 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_oreltailjump_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_oreltailjump_cs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relconcurgc_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relconcurgc_il.ilproj
index fe55035..60b1153 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relconcurgc_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relconcurgc_il.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relenum_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relenum_cs.csproj
index 3c9002b..df498fc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relenum_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relenum_cs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relnestval_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relnestval_cs.csproj
index a10628f..4584a11 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relnestval_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relnestval_cs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relnestval_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relnestval_il.ilproj
index 06646b4..c6b85d1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relnestval_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_relnestval_il.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_cs.csproj
index 8533053..921488f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_reltailjump_cs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_reltypedref.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_reltypedref.ilproj
index 079a49f..d17c92c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_reltypedref.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/misc/_reltypedref.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_dbgsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_dbgsin_cs.csproj
index 4f47fd3..f9e0cad 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_dbgsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_dbgsin_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_odbgsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_odbgsin_cs.csproj
index cbdf4a3..2015389 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_odbgsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_odbgsin_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_orelsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_orelsin_cs.csproj
index 35a69c7..f85218a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_orelsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_orelsin_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_relsin_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_relsin_cs.csproj
index b60aa07..7593643 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_relsin_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/morph/_relsin_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgfault.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgfault.ilproj
index cb3f863..ff7e969 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgfault.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgfault.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgfilter.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgfilter.ilproj
index 2784b1a..c46674a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgfilter.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgfilter.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_cs.csproj
index 222fa26..8c442ee 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_il.ilproj
index 7617667..f18c203 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_dbgtry_il.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_odbgtry_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_odbgtry_cs.csproj
index 9c9772a..5c4b4655 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_odbgtry_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_odbgtry_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_oreltry_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_oreltry_cs.csproj
index 3ef597c..58816fd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_oreltry_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_oreltry_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_relfault.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_relfault.ilproj
index 2d3d95e..61c7c63 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_relfault.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_relfault.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_relfilter.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_relfilter.ilproj
index 50f77fa..9e8d4cf 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_relfilter.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_relfilter.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_reltry_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_reltry_cs.csproj
index 42dd63e..eff8433 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_reltry_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_reltry_cs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_reltry_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_reltry_il.ilproj
index 3a17e54..52c538f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_reltry_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/seh/_reltry_il.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_cs.csproj
index ad7a510..2eea296 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_cs.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="sinlib_cs.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj
index 7317a71..b3bc37b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_cs_il.csproj
@@ -42,10 +42,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/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_cs.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_cs.ilproj
index 4e135fb..6f3f0e0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_cs.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_cs.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_il.ilproj
index c98f282..ec856d0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_dbgsin_il_il.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_cs.csproj
index 8a04e0f..f2662d8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_cs.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="sinlib_cs.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj
index fd7c1ea..6626dcb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_cs_il.csproj
@@ -42,10 +42,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/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_cs.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_cs.ilproj
index 4e135fb..6f3f0e0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_cs.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_cs.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_il.ilproj
index c98f282..ec856d0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_odbgsin_il_il.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_cs.csproj
index 5533855..984f06d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_cs.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="sinlib_cs.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj
index 0acb30b..4da29eb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_cs_il.csproj
@@ -42,10 +42,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/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_cs.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_cs.ilproj
index cceca0f..a20eb0a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_cs.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_cs.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_il.ilproj
index aedd3d2..e695c6b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_orelsin_il_il.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_cs.csproj
index 48c4e02..4a5eb56 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_cs.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="sinlib_cs.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj
index 298abcc..db326af 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_cs_il.csproj
@@ -42,10 +42,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/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_cs.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_cs.ilproj
index cceca0f..a20eb0a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_cs.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_cs.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_il.ilproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_il.ilproj
index aedd3d2..e695c6b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_il.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/_relsin_il_il.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/sinlib_cs.csproj b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/sinlib_cs.csproj
index b466a75..3b11343 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/sinlib_cs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Boxing/xlang/sinlib_cs.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/Coverage/arglist_pos.ilproj b/src/coreclr/tests/src/JIT/Methodical/Coverage/arglist_pos.ilproj
index caca598..f0f2afc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Coverage/arglist_pos.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Coverage/arglist_pos.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Coverage/b433189.csproj b/src/coreclr/tests/src/JIT/Methodical/Coverage/b433189.csproj
index 73bf441..b9aecee 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Coverage/b433189.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Coverage/b433189.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj
index b57b246..c05bed0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_array_merge.ilproj
@@ -38,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/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_box.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_box.ilproj
index 290890b..9be1fb9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_box.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgi_box.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj
index 2a0ff9f..9d29235 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_array_merge.ilproj
@@ -38,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/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_box.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_box.ilproj
index 340936b..1933675 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_box.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_dbgu_box.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj
index bf6a61d..6f462b9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_array_merge.ilproj
@@ -38,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/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_box.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_box.ilproj
index b2d53ba..53bc3c8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_box.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_reli_box.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj
index dfcf078..ebc70d9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_array_merge.ilproj
@@ -38,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/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_box.ilproj b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_box.ilproj
index a89d4dc..9c2f56c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_box.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ELEMENT_TYPE_IU/_il_relu_box.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj
index b3b99be..c67c512 100644
--- a/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj
index 36f3666..87f5ce8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj
index c4e4d3e..dcb4951 100644
--- a/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj
index fa8c997..914228f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr4a_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj
index b834c78..f39fd58 100644
--- a/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj
index c2707ba..0449de6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj
index 6e14e23..ab57951 100644
--- a/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj
index d8b6a10..866a70a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convr8a_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convx_il_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convx_il_d.ilproj
index 795bba2..0e22bca 100644
--- a/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convx_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convx_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convx_il_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convx_il_r.ilproj
index 79fcf9f..aa8e1c7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convx_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/FPtrunc/convx_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj
index 1104172..807feec 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj
index acfad19..661830f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj
index a72eba4..96f3ce8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj
index 22c2626..9d5d4ed 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param1a_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj
index 4e93916..02744d8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj
index ad70fee..26a48eb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj
index d3adbf8..148a62a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj
index afd86aa..a7af3d8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2a_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_d.ilproj
index 1d9e93a..655c394 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_r.ilproj
index 5512150..5b3dba5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2b_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_d.ilproj
index e7de997..ff6a51d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_r.ilproj
index cfde822..1165ffa 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param2c_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj
index 764483a..0b83e1e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj
index 6bf4832..1cb2614 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj
index f1bbc7f..44b2170 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj
index 606de87..3e6272b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/25params/25param3a_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally.csproj
index f132b33..16234f0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally_tail.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally_tail.csproj
index 4549b17..260a132 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally_tail.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_dbgcatchfinally_tail.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally.csproj
index 5b35fc5..d443e58 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally_tail.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally_tail.csproj
index eadc553..b785269 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally_tail.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_relcatchfinally_tail.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally.csproj
index bd2fc1d..5bf37d3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally_tail.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally_tail.csproj
index 6accb57..028727b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally_tail.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_dbgcatchfinally_tail.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally.csproj
index 27db20b..e40c6a6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally_tail.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally_tail.csproj
index e2a1cf4..0c00342 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally_tail.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/SEH/_speed_relcatchfinally_tail.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_dbgtest1.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_dbgtest1.csproj
index fd93412..bbcf24f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_dbgtest1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_dbgtest1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_reltest1.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_reltest1.csproj
index f91a20b..882bd9c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_reltest1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_reltest1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_speed_dbgtest1.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_speed_dbgtest1.csproj
index a522fb7..6ff2a33 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_speed_dbgtest1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_speed_dbgtest1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_speed_reltest1.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_speed_reltest1.csproj
index 3b06580..184e560 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_speed_reltest1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/callvirt/_speed_reltest1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_dbgval_ctor.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_dbgval_ctor.csproj
index ad6a945..395d64c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_dbgval_ctor.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_dbgval_ctor.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_relval_ctor.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_relval_ctor.csproj
index d5dde75..1af93d1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_relval_ctor.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_relval_ctor.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_speed_dbgval_ctor.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_speed_dbgval_ctor.csproj
index 8021c63..77ff647 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_speed_dbgval_ctor.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_speed_dbgval_ctor.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_speed_relval_ctor.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_speed_relval_ctor.csproj
index 57f9216..e697359 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_speed_relval_ctor.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/ctor/_speed_relval_ctor.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_dbgdeep.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_dbgdeep.csproj
index 0da69a1..380cf09 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_dbgdeep.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_dbgdeep.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_reldeep.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_reldeep.csproj
index ba8e3b8..56fc998 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_reldeep.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_reldeep.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_speed_dbgdeep.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_speed_dbgdeep.csproj
index 2766089..1b62fff 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_speed_dbgdeep.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_speed_dbgdeep.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_speed_reldeep.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_speed_reldeep.csproj
index 0daf66d..95c087a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_speed_reldeep.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/deep/_speed_reldeep.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_dbgrecurse.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_dbgrecurse.csproj
index 535db94..56e502e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_dbgrecurse.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_dbgrecurse.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_relrecurse.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_relrecurse.csproj
index 9f3d4c8..264506f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_relrecurse.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_relrecurse.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_speed_dbgrecurse.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_speed_dbgrecurse.csproj
index f5ee2b6..22b5729 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_speed_dbgrecurse.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_speed_dbgrecurse.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_speed_relrecurse.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_speed_relrecurse.csproj
index 7e9eece..3dd28dd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_speed_relrecurse.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/fptr/_speed_relrecurse.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_dbgobj.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_dbgobj.csproj
index 89eb81a..dbedbaf 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_dbgobj.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_dbgobj.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i1.ilproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i1.ilproj
index 701d13b..4b1aac8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i2.ilproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i2.ilproj
index d0e3ec4..0dc67c7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i2.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4i2.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u1.ilproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u1.ilproj
index 6043d97..265dce6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgi4u1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu1.ilproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu1.ilproj
index 8bf427b..9f3a472 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_dbgiu1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i1.ilproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i1.ilproj
index 0a38d93..b50d2a6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i2.ilproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i2.ilproj
index 5ff9548..8368b2a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i2.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4i2.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u1.ilproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u1.ilproj
index 36d8184..29a5a29 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reli4u1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu1.ilproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu1.ilproj
index dbe2a0f..234fe75 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_il_reliu1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_relobj.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_relobj.csproj
index b323b5a..079f3e5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_relobj.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_relobj.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_speed_dbgobj.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_speed_dbgobj.csproj
index f945cf7..d2b6c6a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_speed_dbgobj.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_speed_dbgobj.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_speed_relobj.csproj b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_speed_relobj.csproj
index b1305ef..eec83b2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_speed_relobj.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Invoke/implicit/_speed_relobj.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj
index cd4887b..2140a59 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj
index 1f6349c..7e7afb3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj
index 775585b..4bb1877 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj
index c056778..7119571 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/bool_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj
index 8007621..04981a9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj
index e698895..a34c674 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj
index f10c6fb..2cd0818 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj
index 6c62d5e..a56f0cc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/byte_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj
index 9ad4199..7cf78eb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj
index 1bbf940..e64825e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj
index 9bacc4e..6fc36b8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj
index a2c98d0..c946772 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/char_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj
index 67cf255..7ea6879 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj
index 8589d0b..7154edb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj
index 5d41939..70bd89b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj
index 19a7f80..0590e5d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/decimal_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj
index 9a7f457..85ee851 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj
index 66986af..cd1c6ca 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj
index 5945b51..f04f512 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj
index a17f09b..c31ced9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/double_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj
index 9457294..6ffb762 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj
index ce49ace..2f146d2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj
index 88a83f0..0448392 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj
index e1a1f3d..023825e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/float_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj
index 2407480..9bb7f20 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj
index 2806937..3516446 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj
index 924cc4f..63f4de9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj
index 254b2e4..a9f180c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/int_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj
index 0b3a125..68a0e6d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj
index 046532a..1e5331b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj
index e2785fb..efbefa3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj
index 2ad68d9..5f9df64 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/long_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj
index 9cc3caa..222eafd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj
index 10aff67..344b0bd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj
index 679860a..9516f0f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj
index c99cf2f..88a4c6d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/sbyte_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj
index e8059cd..2c59f8a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj
index 9b5e242..06853d5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj
index f351ad7..d54f5ae 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj
index a2a460a..5434b50 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/short_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj
index 4539a19..553db6f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj
index bfb9271..90a0462 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj
index 54874c4..f160636 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj
index 6b4c663..f9ce502 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/uint_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj
index e86d76a..edc3817 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj
index 1735c30..f875c6cf 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj
index fb1473f..772a71f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj
index 9a23f9b..ad99a90 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ulong_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj
index f50463b..9cd97f4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj
index 4a2b9e5..212e56e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj
index ad6fc7e..14d8a63 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj
index f00bccb..4a4e8c7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/DataTypes/ushort_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_d.csproj
index 87cb579..ec5d761 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_do.csproj
index ec27912..1289664 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_r.csproj
index 5eda964..335d68f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_ro.csproj
index 2ea8b99..95c1179 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/classarr_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_d.csproj
index e13de42..ca6437a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_do.csproj
index 06c3f3e..88c7aab 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_r.csproj
index a85fa99..1445387 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_ro.csproj
index fbbc482..3d22626 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/jaggedarr_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj
index 158fbf0..31aa59d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj
index b028276..13a1fd9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj
index 2953df8..0437573 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj
index d992734..96f286e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/plainarr_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_d.csproj
index 66f2215..b7bb1cf 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_do.csproj
index 257feb2..29c09f2c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_r.csproj
index c2d7903..2048cb1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_ro.csproj
index 9efeebc..eb93d9d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/GaussJordan/structarr_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_d.csproj
index 57e8deb..4f8f8a7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_do.csproj
index e093946..3758da8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_r.csproj
index 25832f1..e7764e4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_ro.csproj
index ea419bd..161ee9a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/classarr_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_d.csproj
index 62560fd..abb8139 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_do.csproj
index 34985c3..251b819 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_r.csproj
index 66aba5c..39151a5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_ro.csproj
index d25b267..bde0ed2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/doublearr_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj
index facd2ef..cb951f8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj
index e99fa10..3046c66 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj
index 6a0f541..4dca443 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj
index f05adef..43c6c8a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/intarr_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_d.csproj
index 83382f4..8910463 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_do.csproj
index a77079f..136afb1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_r.csproj
index e909557..9af9d83 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_ro.csproj
index 763cff9..2914f53 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/jaggedarr_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_d.csproj
index 6baca6d..03ff6a2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_do.csproj
index ceb9e5e..cce2e1f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_r.csproj
index 7c93429..4dd6f90 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_ro.csproj
index e049a0d..b685d3d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/stringarr_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_d.csproj
index fb15fd3..92e3105 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_do.csproj
index 3ff9d28..5bcc208 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_r.csproj
index 03e669b..afb6b5b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_ro.csproj
index 1f1e5f1..1cdec9d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/InnerProd/structarr_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_d.csproj
index 50c845c..ec51e65 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_do.csproj
index 2127b64..ca953dc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_r.csproj
index 284fd18..681763b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_ro.csproj
index fad359d..fb35e0d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/classarr_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_d.csproj
index 10914b9..e84b194 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_do.csproj
index 44a831e..f7d0347 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_r.csproj
index 06b576b..bb54f94 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_ro.csproj
index 5a6bc87..64ad58e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/doublearr_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_d.csproj
index 81c0ff8..6ca28bb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_do.csproj
index 24752bc..fde5333 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_r.csproj
index 3085bb4..04f76ce 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_ro.csproj
index 69671a4..f0cbb6d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/jaggedarr_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_d.csproj
index afbad69..9ad5d9d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_do.csproj
index cbd6945..d78127a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_r.csproj
index e393a55..ea969dd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_ro.csproj
index d7a800b..558aa50 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/stringarr_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_d.csproj
index 2d27bec..bb9c4e1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_do.csproj
index 59d7361..cfa35f8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_r.csproj
index a69dc6c..97fcb1c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_ro.csproj
index 612beb9..99a4c15 100644
--- a/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/MDArray/basics/structarr_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_d.csproj
index 7bf727f..2867c7d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_do.csproj
index 175eac6..3d646f9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_r.csproj
index 349c900..d7f0ec3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_ro.csproj
index f574dd6..777c525 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_d.csproj
index c6a0f07..b1c2605 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_d.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_do.csproj
index 0fefffa..d0c1980 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_do.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_r.csproj
index 04839b6..c899a99 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_r.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_ro.csproj
index da48471..9cfbbc1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm32_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_d.csproj
index 9f5024e..c887b6e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_do.csproj
index ec742ae..353f6ec 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_r.csproj
index 528a774..7d1c055 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_ro.csproj
index b7f8609..3e927b1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_d.csproj
index 96e16fa..f367218 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_d.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_do.csproj
index bbee4f6..2cf0a8f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_do.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_r.csproj
index 505e509..3149ef6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_r.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_ro.csproj
index de1b531..07f9fe7e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/arithm64_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_d.csproj
index c2c98b6..1841af0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_d.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_do.csproj
index 456ed23..e8c75e6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_do.csproj
@@ -38,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/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_r.csproj
index f870819..05d1637 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_r.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_ro.csproj
index d7a581c..a31c16f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_cs_ro.csproj
@@ -38,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/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_d.ilproj
index b7ab0ee..85d3b3f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_d.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_r.ilproj
index a88c4b4..197c097 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/intrinsic_nonf_il_r.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj
index 567089f..d3bfa84 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj
index 6963c24..1e0d9f3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj
index 8c1e863..36bc28d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj
index 27595ba..c72a09a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNadd_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj
index 2e07e4a..cfe0125 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj
index 3ef8a77..bd927e8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj
index 18cd8dd..97161f7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj
index 36ad613..a225f46 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNdiv_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj
index 5991eca..1137c3d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj
index 862d560..0917e7f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj
index 4fbe33f..ad88972 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj
index 1561ca3..8aa58eb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNmul_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj
index 76a1c61..0166b8c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj
index b5a776f..b9db2ba 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj
index a5ccf10..cac48fd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj
index 4c177a4..6d18c9e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNrem_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj
index 7a0c046..d0f008c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj
index e3abff0..ddb51d0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj
index 23d8049..f151a05 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj
index a3ceae1..13dbeca 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4NaNsub_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r4nanconv_il_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4nanconv_il_d.ilproj
index c605d5a..6c43dd1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4nanconv_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4nanconv_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/NaN/r4nanconv_il_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r4nanconv_il_r.ilproj
index c4b351c..b740ea8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r4nanconv_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r4nanconv_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj
index 4328bba..72e5923 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj
index 9269e77..c72de00 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj
index 018241a..f950896 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj
index ad6631f..3ec522f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNadd_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj
index 75ba17e..506dc54 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj
index 0865a53..6d43438 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj
index 223af30..20cdef1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj
index 4ea8f13..41f2ff3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNdiv_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj
index 5cffd73..963af25 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj
index f3d67ab..4949e9d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj
index 1e5240c..d5eed59 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj
index 91f1b38..4bb9575 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNmul_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj
index 97adf16..c4517eb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj
index 50f109a..74d620e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj
index 66c16fb..8cc8540 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj
index a654531..217e51f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNrem_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj
index 9f3043a..b83d20a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj
index 99c3376..8ed6f73 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj
index 334ab80..39aa3d2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj
index 6d7424e..2ffd442 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8NaNsub_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/NaN/r8nanconv_il_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8nanconv_il_d.ilproj
index cf1c99b..be23d8b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8nanconv_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8nanconv_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/NaN/r8nanconv_il_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/NaN/r8nanconv_il_r.ilproj
index 4185db1..a03d368 100644
--- a/src/coreclr/tests/src/JIT/Methodical/NaN/r8nanconv_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/NaN/r8nanconv_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj
index ba1ee5d..4299ae3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj
index 05eff81..2134023 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj
index 953427a..0703596 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj
index 5de8eb7..2c4529b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatInfinitiesToInt_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj
index 1041f4b..5e1a014 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj
index 8e64604..37699a0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj
index 826344c..551520f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj
index 25b345c..cc6ef71 100644
--- a/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/Overflow/FloatOvfToInt2_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj
index 8bda9a5..df408e9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj
index 9f1f7cd..840a5be 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj
index 00e6e65..52aa55a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj
index 1af37db..ebd89e5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps1.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps1.ilproj
index 6672f17..9d9a76f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps2.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps2.ilproj
index 7708525..4ed808e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps2.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps2.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps3.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps3.ilproj
index 0092ee0..7e463cc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps3.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps3.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps4.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps4.ilproj
index 7aad665..ebdf621 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps4.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps4.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps5.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps5.ilproj
index 2aae027..f00885e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps5.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_dbgjumps5.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps1.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps1.ilproj
index d2e606e..ba0ccd7e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps1.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps2.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps2.ilproj
index 0b61f86..0a1418a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps2.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps2.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps3.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps3.ilproj
index c7def37..6729fd4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps3.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps3.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps4.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps4.ilproj
index 2d8bf72..91c6969 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps4.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps4.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps5.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps5.ilproj
index aeecfbc..ec1b199 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps5.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_il_reljumps5.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj
index 4dc71a0..ddaa751 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj
index 355b842..da4e812 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj
index f66e823..49c5e30 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj
index fe06dbe..c44ebb8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj
index 7032a6f..43e223b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj
index 7c948b7..c11cbb1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj
index e3c22ee..c863891 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj
index 0dbb89f..5cf7ca3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj
index f48041c..e28a9b0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj
index 17ef087..1668eec 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj
index 78f8a92..721949f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj
index 8f274e0..9d43b6e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj
index dcbd668..c4e9b92 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj
index 12d1188..16814a6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbggc_nested.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj
index 756b23b..6928c17 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj
index b1d4800..84d0567 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj
index 304b7b2..04c07e4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj
index 43ec42f..cc9b23f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj
index 7849294..ab96033 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj
index 87b6765..fad6394 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj
index 8670882..249211c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_dbgnested.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghan3.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghan3.ilproj
index 8c0428d..a624ccf 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghan3.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghan3.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ctor.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ctor.ilproj
index 8f33f00..175d1a8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ctor.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ctor.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ref.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ref.ilproj
index 4b3865f..cc91033 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ref.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghan3_ref.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi.ilproj
index d86623a..68b8587 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi2.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi2.ilproj
index 073fde0..d0291b3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi2.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbghanoi2.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbgknight.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbgknight.ilproj
index e86a114..63c1131 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbgknight.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbgknight.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbgnested.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbgnested.ilproj
index 65a62d0..a5b09a5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbgnested.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_dbgnested.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhan3.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhan3.ilproj
index 12b56c0..bf27313 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhan3.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhan3.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ctor.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ctor.ilproj
index ff3b3d1..c870d35 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ctor.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ctor.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ref.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ref.ilproj
index a067ea53..5f401a26 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ref.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhan3_ref.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhanoi.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhanoi.ilproj
index 571106b..e563e80 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhanoi.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhanoi.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhanoi2.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhanoi2.ilproj
index 8ffdceb..15d9dbb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhanoi2.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relhanoi2.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relknight.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relknight.ilproj
index b0b5d6f..792d6ed 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relknight.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relknight.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relnested.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relnested.ilproj
index 666d61a..589108e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relnested.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_il_relnested.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj
index b63fd8d..dcd265b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj
index cc47166..e5c9b82 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relgc_nested.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj
index 48ffa36..053a9c1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj
index 6b66347..f5aba7e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj
index c42c937..50736e7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj
index 6a442ce..a7f8b6d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj
index 1e4924b..8c818dd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relknight.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relknight.csproj
index 569b546..6d2d61f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relknight.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relknight.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relnested.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relnested.csproj
index c298dc4..3caa503 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relnested.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_relnested.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj
index 00606ab..e63bdc1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj
index c0c77b1..129dfc3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbggc_nested.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj
index 8924d48..7f20c35 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj
index 7301a07..fd821fd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj
index 1042b3d..e599cde 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj
index 280b857..480bcfa 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj
index b4eb884..fabd5ca 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj
index ad05941..ee14a88 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj
index 924ac26..fe395b6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_dbgnested.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj
index 592a929..8375304 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj
index eac1db5..398ab83 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relgc_nested.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj
index 6090bb8..325e434 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj
index 9f5a3b8..7f6799c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj
index b372cc8..776a9fd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj
index 78022df..9fff9d4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj
index eeed2fb..c76664a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj
index 7a35c0a..54374e9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj
index 7c14d2d..7563fec 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/_speed_relnested.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj
index a4c0cde..4916862 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/VT/etc/nested.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/etc/nested.csproj
index 086cae6..282daea 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/etc/nested.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/etc/nested.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj
index 6832454..36d8fe8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj
index ba98891..ebf9268 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj
index 5f7daa7..f1b5148 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj
index 1d0c923..755d2e5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj
index 9381371..5223236 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj
index 9705e9a..7dd74c1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj
index 14d147b..539db26 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj
index 308bd90..cda6316 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj
index b72158a..8e001d1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj
index 05bdec7..543b955 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/VT/port/_il_dbghuge_gcref.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/port/_il_dbghuge_gcref.ilproj
index 6c8e803..db544ca 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/port/_il_dbghuge_gcref.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/port/_il_dbghuge_gcref.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/port/_il_relhuge_gcref.ilproj b/src/coreclr/tests/src/JIT/Methodical/VT/port/_il_relhuge_gcref.ilproj
index b66a8c0..67f8d04 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/port/_il_relhuge_gcref.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/port/_il_relhuge_gcref.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/port/_rellcs.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/port/_rellcs.csproj
index b46a5c4..8a580c7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/port/_rellcs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/port/_rellcs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj
index 4e5f7c6..3400b28 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj
index c87b46f..63e0253 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj
index 3a8f457..152ef3d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj
index 9f03474..2ea6b21 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj b/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj
index 8aa93be..079a4d2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_dbgcast_throw.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_dbgcast_throw.csproj
index d29f1d9..6f66b4e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_dbgcast_throw.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_dbgcast_throw.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_dbgthrow.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_dbgthrow.csproj
index bd6b4ab..eb50aae 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_dbgthrow.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_dbgthrow.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_relcast_throw.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_relcast_throw.csproj
index df004fa..d45ca00 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_relcast_throw.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_relcast_throw.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_relthrow.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_relthrow.csproj
index 229ca70..1518617 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_relthrow.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_relthrow.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_dbgcast_throw.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_dbgcast_throw.csproj
index 27433a9..c4d30d2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_dbgcast_throw.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_dbgcast_throw.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_dbgthrow.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_dbgthrow.csproj
index dee51c9..95f90b7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_dbgthrow.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_dbgthrow.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_relcast_throw.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_relcast_throw.csproj
index f5da8fd..94e5721 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_relcast_throw.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_relcast_throw.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_relthrow.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_relthrow.csproj
index 048fbf8..fbc745f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_relthrow.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/SEH/_speed_relthrow.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_call.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_call.csproj
index fd67d2a..8786d70 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_call.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_call.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldarg.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldarg.csproj
index d27bd56..658984d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldarg.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldarg.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldloc.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldloc.csproj
index c262d4d..d7d10f9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldloc.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_ldloc.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_newobj.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_newobj.csproj
index d7cc894..82edd11 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_newobj.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgcastclass_newobj.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_call.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_call.csproj
index b03213e..52fdc02 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_call.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_call.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldarg.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldarg.csproj
index 6b546d6..0d80e9a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldarg.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldarg.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldloc.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldloc.csproj
index 9b7c84d..5707fd2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldloc.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_ldloc.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_newobj.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_newobj.csproj
index 9a2df2b..61d47a2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_newobj.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_dbgisinst_newobj.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_call.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_call.csproj
index 6062861..6817fb2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_call.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_call.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldarg.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldarg.csproj
index 66ee2f5..37c951e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldarg.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldarg.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldloc.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldloc.csproj
index 130806c..ee39be0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldloc.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_ldloc.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_newobj.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_newobj.csproj
index b5e7085..037dc5d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_newobj.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relcastclass_newobj.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_call.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_call.csproj
index c22bf08..960bc7b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_call.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_call.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldarg.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldarg.csproj
index dfd2bf4..4befc55 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldarg.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldarg.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldloc.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldloc.csproj
index a026a8e..b7873576 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldloc.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_ldloc.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_newobj.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_newobj.csproj
index 7c3080a..2ea5c0b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_newobj.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_relisinst_newobj.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_call.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_call.csproj
index ad6943b..1b51cd7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_call.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_call.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldarg.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldarg.csproj
index bd8026a..813ae8b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldarg.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldarg.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldloc.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldloc.csproj
index 04ce1dc..931d8a0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldloc.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_ldloc.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_newobj.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_newobj.csproj
index a2e333f..e1ee1a2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_newobj.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgcastclass_newobj.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_call.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_call.csproj
index 756001e..948a768 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_call.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_call.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldarg.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldarg.csproj
index 1ac7845..be7d774 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldarg.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldarg.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldloc.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldloc.csproj
index 97c7eaf..a613e7e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldloc.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_ldloc.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_newobj.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_newobj.csproj
index ea32ab1..529850b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_newobj.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_dbgisinst_newobj.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_call.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_call.csproj
index 3d18104..c98c821 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_call.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_call.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldarg.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldarg.csproj
index 86245b1..f876281 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldarg.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldarg.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldloc.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldloc.csproj
index b8f0cc9..2568659 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldloc.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_ldloc.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_newobj.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_newobj.csproj
index c5fa457..70c51b7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_newobj.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relcastclass_newobj.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_call.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_call.csproj
index 377a9fe..28b0ed2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_call.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_call.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldarg.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldarg.csproj
index 814de04..d095460 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldarg.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldarg.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldloc.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldloc.csproj
index 8571ff0..48d8cf5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldloc.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_ldloc.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_newobj.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_newobj.csproj
index e21714a..72af01a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_newobj.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/coverage/_speed_relisinst_newobj.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/iface/_dbgiface1.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/iface/_dbgiface1.csproj
index 718fae2..3b3afa7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/iface/_dbgiface1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/iface/_dbgiface1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/iface/_reliface1.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/iface/_reliface1.csproj
index 05b7dde..47f5abb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/iface/_reliface1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/iface/_reliface1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/iface/_speed_dbgiface1.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/iface/_speed_dbgiface1.csproj
index b3af45f..77c556c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/iface/_speed_dbgiface1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/iface/_speed_dbgiface1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/iface/_speed_reliface1.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/iface/_speed_reliface1.csproj
index 9d9bcba..111036e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/iface/_speed_reliface1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/iface/_speed_reliface1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/casts/ilseq/_il_relCommonBase.csproj b/src/coreclr/tests/src/JIT/Methodical/casts/ilseq/_il_relCommonBase.csproj
index ee39ad7..b62a50a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/casts/ilseq/_il_relCommonBase.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/casts/ilseq/_il_relCommonBase.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_d.csproj
index 874bbe5..fb4be72 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_do.csproj
index 1eec5d1..e21213e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_r.csproj
index ae9cc89..e6f14d1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_ro.csproj
index d99acec..bed4f21 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/Desktop/throw_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_d.csproj
index ae740af..790668d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_d.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_do.csproj
index 368fe3f..8e6e98f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_do.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_r.csproj
index e500488..b9d8836 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_r.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj
index d4e30b2..3ebca6d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/assemname_cs_ro.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/cctor/misc/global_il_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/global_il_d.ilproj
index 60b9d65..393836f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/global_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/global_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/global_il_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/global_il_r.ilproj
index fb4580b..0153937 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/global_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/global_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/testlib.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/testlib.csproj
index df56338..b587cf6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/testlib.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/testlib.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_d.csproj
index d67a456..daf0ffe 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_d.csproj
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_do.csproj
index 6f4ba43..6519fdc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_do.csproj
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_r.csproj
index 9644edc..7653780 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_r.csproj
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj
index d1ed7d5..3709e5a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads1_cs_ro.csproj
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_d.csproj
index 1c0b700..1fdaa22 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_d.csproj
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_do.csproj
index e7b2b27..d11a2f0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_do.csproj
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_r.csproj
index 64fa439..51cb58c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_r.csproj
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj
index ca797df..0a5f12e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/threads2_cs_ro.csproj
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_d.csproj
index 7dc4ad3..5b6bd1d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -38,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_do.csproj
index 8c511f7..cbb2134 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -38,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_r.csproj
index 55da5db..047fbd6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_ro.csproj
index c3d94cc..d9230be 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/misc/throw_cs_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_d.csproj
index f6c826d..c45d269 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_do.csproj
index d199fd6..6d8b8de 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_r.csproj
index a804e40..a29187c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj
index 3a5fc46..b17050e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj
index 5a6cfae..dcbf22e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj
index 7a624fd..4156fae 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj
index 884328b..93c343c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj
index fe09d42..0e1bf10 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise1b_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_d.csproj
index f2bbabb..77178e9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_do.csproj
index c89dd3f..5b28408 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_r.csproj
index 4f34e18..e6a1c93 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj
index c93b3a5..195e8fe 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise2_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_d.csproj
index 2e55a5b..a62d6af 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_do.csproj
index 48ba182..d7c935b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_r.csproj
index f28bf5b..209e752 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj
index a548ea2..f72d6b9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/simple/precise4_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/testlib.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/testlib.csproj
index 34c856b..ee02040 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/testlib.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/testlib.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_d.csproj
index 91ec868..edbaf1e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_do.csproj
index 7c9d515f..75a9866 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_r.csproj
index 908dc3f..3071431 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_ro.csproj
index d122b1e..05127a2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1_cs_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_d.csproj
index dcce689..185ccab 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_do.csproj
index 56c10f1..78d7b49 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_r.csproj
index 37eee3e..e83182b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_ro.csproj
index 84da82e..eaa1ab7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise1b_cs_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_d.csproj
index 8a14ba0..919a169 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_do.csproj
index 87ac59d..04be53e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_r.csproj
index 0db84e6..462bd10 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_ro.csproj
index d7861ce..302f84c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise2_cs_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_d.csproj
index 03a9711..f26b097 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_do.csproj
index f3943df..5d2460f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_r.csproj
index dacc3f8..c40597b6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_ro.csproj
index 190d46e..03de2f2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/cctor/xassem/xprecise4_cs_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="testlib.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_d.ilproj
index 744ce68..1fbe5ca 100644
--- a/src/coreclr/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_r.ilproj
index 512a705..7db03ed 100644
--- a/src/coreclr/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/delegate/_simpleoddpower_il_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj
index 4c257aa..b80f1b3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj
index 3f41101..c8e9405 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj
index 611d671..6de341c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj
index 8eb5e32..1402edf 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/decimaldiv_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_d.csproj
index 9ed1a31..cea9d4a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_do.csproj
index cf3aef2..2f7adf7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_r.csproj
index 4028067..66ae1d1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_ro.csproj
index 698495a..69f9c80 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i4div_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_d.csproj
index ecb0fde..2fb477a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_do.csproj
index fb90ce4..7fb46a5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_r.csproj
index 3f50c2c..a4a7a9e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_ro.csproj
index 47a3655..04293a4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/i8div_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/negSignedMod.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/negSignedMod.csproj
index 3c17074..a1dc254 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/negSignedMod.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/negSignedMod.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj
index 92b8e42..5633a21 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj
index 37e2a91..8d2915c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj
index 12a2ec8..907ef99 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj
index acac1c9..2e439b4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/overlddiv_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_d.csproj
index 06a202b..6c378c2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_do.csproj
index 8824638..bd89659 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_r.csproj
index de06b8e..9f35c16 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_ro.csproj
index 6c9580e..c0cab4f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r4div_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_d.csproj
index 9b4966d..0bd0797 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_do.csproj
index 5c2c8a3..58cb368 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_r.csproj
index c5dafb2..227822c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_ro.csproj
index 7cc665e..ff06fb1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/r8div_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_d.csproj
index 7843202..fe9a760 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_do.csproj
index 614bef02..165186f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_r.csproj
index e848e4f..fe8bddb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_ro.csproj
index 92699b1..e9b9eb9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u4div_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_d.csproj
index 3a454df..27e8a41 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_do.csproj
index 6a17c38..0c20ee9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_r.csproj
index cd4d013..a974289 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_ro.csproj
index a97a107..1b0c458 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/div/u8div_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj
index c6ef57b..d3cebe4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj
index d47f1e7..5ee8b89 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj
index 85036e6..3fae81a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj
index 33fc93d..f10f7eb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/decimalrem_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj
index bc73340..1d04843 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj
index 7ba0926..9389bf2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj
index 81ea6a5..004ebde 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj
index 5a92c6a..b49adf6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i4rem_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj
index c74d713..6725541 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj
index acc8c04..e96da16 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj
index 151120f..1bd046c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj
index a70fc22..6462081 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/i8rem_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj
index 5406739..a480152 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj
index 40cebd6..d77df48 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj
index 5155036..beaf3df 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj
index f54ad96..594e87b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/overldrem_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj
index 3dc1ec2..41bc028 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj
index 48d43c3..0c1520d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj
index 7ffd367..632eacc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj
index a4f1718..a1e0cd5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r4rem_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj
index 4968870..b2d3399 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj
index e83710d..1df4532 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj
index ac60559f..738fa72 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj
index c0ec3e9..a36b8eb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/r8rem_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj
index 50581bb..36d135f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj
index 3222131..2e69f42 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj
index 62abfcd..3457274 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj
index ec2ccef..9bfb46f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u4rem_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj
index 73916ad..6f19cc4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj
index 791debb..dd9aa9f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj
index 8016f0d..2fc368a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj
index 7b29739..2daccc3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/divrem/rem/u8rem_cs_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_d.csproj
index df1ca24..0f95423 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_do.csproj
index f41f063..2cf81f6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_r.csproj
index 8c125f3..813f66a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_ro.csproj
index 1719e4a..cb604cb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray1_cs_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_d.csproj
index c2958a6..c32ca21 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_do.csproj
index 1b13e5c..87ffd11 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_r.csproj
index 142a7e3..aae5a63 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_ro.csproj
index 8376c8e..e8f36ad 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray2_cs_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_d.csproj
index 069ee7c..84f2d5b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_do.csproj
index 77f71d7..6ca76e9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_r.csproj
index 9644928..407b779 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_ro.csproj
index 34e6da0..6d9a533 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray3_cs_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_d.csproj
index 34fd19b..80b7f88 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_d.csproj
@@ -46,10 +46,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_do.csproj
index f76c5d7..7727ef2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_do.csproj
@@ -46,10 +46,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_r.csproj
index 8e73eba..c18083d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_r.csproj
@@ -46,10 +46,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/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_ro.csproj
index 868b326..cbcecd7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/doublearray/dblarray4_cs_ro.csproj
@@ -46,10 +46,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/src/coreclr/tests/src/JIT/Methodical/eh/basics/emptyfinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/emptyfinally_d.ilproj
index 48b0a75..ddfdaa0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/emptyfinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/emptyfinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/emptyfinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/emptyfinally_r.ilproj
index ae44924..31a3f04 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/emptyfinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/emptyfinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_d.csproj
index 926f827..44e05f5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_do.csproj
index c175f2f..0cdfdac 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_r.csproj
index 846e6f1..e32f962 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_ro.csproj
index 3fb6552..66f4573 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/multihandler_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_d.csproj
index 0bcd174..5bae978 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_do.csproj
index 85326e0..c88c1f5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_r.csproj
index cc8917d..5b146c4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_ro.csproj
index 6ebb5ca..fc52ff8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwincatch_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_d.csproj
index 622bf00..a0e84ca 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_do.csproj
index e844f10..42ee4a1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_r.csproj
index f11b0f9..4cba0bd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_ro.csproj
index a649d1a..b1468a9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinclassconstructor_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinexcept_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinexcept_d.ilproj
index 4939f79..6cf3f41 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinexcept_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinexcept_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinexcept_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinexcept_r.ilproj
index 7b9facb..7e92b79 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinexcept_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinexcept_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfault_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfault_d.ilproj
index 569b59b..f3e2a20 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfault_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfault_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfault_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfault_r.ilproj
index f138202d..6d3f18f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfault_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfault_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfilter_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfilter_d.ilproj
index cc45d42..445067e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfilter_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfilter_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfilter_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfilter_r.ilproj
index 479f83e..e38955a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfilter_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfilter_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_d.csproj
index 242531f..7d54502 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_do.csproj
index d379dc3..64f3e95 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_r.csproj
index a24240c..b8b87d3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_ro.csproj
index 054590c..2202df8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinally_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_d.csproj
index 370f148..7321f45 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_do.csproj
index a235dc0..cf5bff75 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_r.csproj
index ba12ad5..d51d005 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_ro.csproj
index 2a64d97..35d8df4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpath_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_d.csproj
index 4935afd..abc358f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_do.csproj
index 8f614a0..7c88fe4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_r.csproj
index 7235f11..55ac546 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_ro.csproj
index 8d888f2..7000904 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyerrpathfn_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.ilproj
index c98bfe3..24f7660 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.ilproj
index 347d394..132d5d7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter1_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.ilproj
index 92bd066..7c1e898 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.ilproj
index f7fe379..b3eb256 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter2_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.ilproj
index afe398c..9461e0f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.ilproj
index 7e7787a..a8ef056 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwinfinallyintryfilter3_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_d.ilproj
index 2cfb9fb..7a94e65 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_r.ilproj
index 444a1bf..4ea30d2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwisfirstinstruction_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_d.csproj
index 149836a..cb763ce 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_do.csproj
index ccdc093..25c3180 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_r.csproj
index 644a65d..be2b2f1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_ro.csproj
index 0682900..73e8178 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/throwoutside_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_d.csproj
index 26f0fe7..5de7205 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_do.csproj
index 9543b3b..ab2ecf9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_r.csproj
index 0139aad..31ac2f7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_ro.csproj
index 9cfc7bb..539947c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatch_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_d.csproj
index 5bf4fd1..aabc33e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_do.csproj
index d905403..cb22654 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_r.csproj
index 6cee58f..707c9ab 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_ro.csproj
index 8bfa3b1..5a280c3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trycatchtrycatch_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryexcept_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryexcept_d.ilproj
index 4eb4352..950a475 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryexcept_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryexcept_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryexcept_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryexcept_r.ilproj
index 885304f..03208a7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryexcept_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryexcept_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfault_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfault_d.ilproj
index 2cc0809..afe231d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfault_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfault_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfault_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfault_r.ilproj
index bb897b7..e728269 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfault_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfault_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_d.ilproj
index c8e346e..8ee97f6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_r.ilproj
index 0c4cde2..39e96a0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatch_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.ilproj
index a0db0f8..6fe603a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.ilproj
index 9da513e..9db91877 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfaulttrycatchfn_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_d.csproj
index 4c5b0c2..b784a06 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_do.csproj
index a27bbe6..9344b2e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_r.csproj
index 4b6f401..e728765 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_ro.csproj
index 1c37d09..7157354 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinally_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_d.csproj
index ff706c6..1479ccc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_do.csproj
index 56a222c..5e0b774 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_r.csproj
index c241970..7d85c73 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_ro.csproj
index 2183b3c..dee9b2a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytrycatch_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_d.csproj
index 7c20293..8ff76e7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_do.csproj
index 6c0ddf8..10461d0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_r.csproj
index 8f432f4..68acda6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_ro.csproj
index ee4b679..206aded 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallytryfinally_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.ilproj
index ef5e3c5..66cda69 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.ilproj
index 2fb19c0..c456b87 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2endfinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.ilproj
index caebeb7..06ea221 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.ilproj
index d6c6930..3214bec 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/tryfinallywith2reachableendfinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_d.csproj
index 63a88bf..22c3bfe 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_do.csproj
index baaa69f..fa35bf0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_r.csproj
index 6163c15..c93ccf9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_ro.csproj
index 150efcf..f04b662 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatch_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_d.csproj
index 82246cb..1b8d5ac 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_do.csproj
index cbfb838..300e6ad 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_r.csproj
index 31319a2..d75ce2e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_ro.csproj
index 0c13b19..712f99c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowcatchfinally_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowexcept_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowexcept_d.ilproj
index e9bba41..fe193e7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowexcept_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowexcept_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowexcept_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowexcept_r.ilproj
index 7a9926b..27f0255 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowexcept_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/basics/trythrowexcept_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/common/common.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/common/common.csproj
index f736178..df3d6b8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/common/common.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/common/common.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_d.csproj
index 5da7824..4cf8c25 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_d.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_do.csproj
index f4b04f4..94e33d6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_do.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_r.csproj
index ceb5a37..58f9899 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_r.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_ro.csproj
index ecde13e..22fb88d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/cs/unsafe_ro.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.ilproj
index 59ac75c..63a45cf 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.ilproj
index d6195df..7c5148e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftercatch_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_d.ilproj
index 597e8b1..b870f92 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_r.ilproj
index 7c7f53a..26c5e08 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfault_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.ilproj
index 0a015db..af869f9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.ilproj
index f454bcd..4bb1a60 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfilter_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj
index 9083da6..ec8ef2f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj
index 6159ea6..223c63a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeafterfinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_d.ilproj
index 4925bdc..bd69716 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_r.ilproj
index d9004ba..9f03ed9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeaftertry_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.ilproj
index a7e31f8..609f5fd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.ilproj
index 2a79c5d..7abeb97 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/badcodeinsidefinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_d.ilproj
index 5bf7cc3..22ed36b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_r.ilproj
index 48592e2..e8c6423 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/branchoverendfinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.ilproj
index 59b5882..1797173 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_d.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.ilproj
index 22e4cfd..8cd8a75 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadEHregionacrossBB_r.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_d.ilproj
index a1bc022..f9eca2c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_d.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_r.ilproj
index 11426b1..3fecc93 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadcodeincatch_r.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.ilproj
index 62421a6..277a9d0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.ilproj
index 57611dc..5b47f3b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadnonlocalexit_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_d.ilproj
index ee4e7df..48ab9fa 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_d.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_r.ilproj
index a9ad9ae..4ff3a44 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerror_r.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.ilproj
index dc349b6..6b776cc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.ilproj
index ef3a447..4165688 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadoponerrorinfunclet_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.ilproj
index b8b1703..e11395c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.ilproj
index d89ec13..05ebe71 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadrgninfunclet_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_d.ilproj
index a3c18fb..0eb2c96 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_r.ilproj
index 651f071..aac77fb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtrycatch_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_d.ilproj
index cf3c0de..8c04ac1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_r.ilproj
index 3199acd..d46fa21 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.ilproj
index bfaec39..5346ffe 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.ilproj
index deff533..5555c5d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/deadtryfinallythrow_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_d.ilproj
index 7d51071..6513a37 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_r.ilproj
index 4832ea8..848bd90 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/endfinallyinloop_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj
index 2b0481f..1ba67cd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_d.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj
index 68b0b91..6d66172 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_do.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj
index 5d22e97..7163780 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_r.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj
index cc604cc..8fdbfec 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/loopstrswitchgoto_ro.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_d.ilproj
index 318503d..f1f30b2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_r.ilproj
index 8e0051b..9edd39f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severaldeadehregions_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.ilproj
index c5e3dc9..b7c638b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.ilproj
index aa20652..78f07fc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/severalnesteddeadehregions_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_d.ilproj
index 3a65095..9a8cde7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_r.ilproj
index 79103f9..fcd197a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/deadcode/simpledeadehregion_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/backwardleave_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/backwardleave_d.ilproj
index 7a32435..a19a51a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/backwardleave_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/backwardleave_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/backwardleave_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/backwardleave_r.ilproj
index faf6921..abf8f65 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/backwardleave_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/backwardleave_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.ilproj
index a58327a..b5354a2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.ilproj
index 7f2538f..a400d48 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchbeforetrybody_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.ilproj
index 351cb2f..4925d5a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.ilproj
index 6e21542..4a1070a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/catchtryintryfinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.ilproj
index f14aa05..3fb9a5f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.ilproj
index 7db245e..94671d5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/faultbeforetrybody_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.ilproj
index 44eb307..0ca5a1a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.ilproj
index cf96689..baddc40 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallybeforetrybody_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.ilproj
index ef3d996..9fba217 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.ilproj
index 7abce28..9bd28ed 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/finallytryintryfinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_d.ilproj
index cb372cd..c0a6e8c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_r.ilproj
index 1559d55..f14f305 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedhandlers_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_d.ilproj
index 43834da..ae487f1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_r.ilproj
index 91ab818..e93da0c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/reversedtryblock_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.ilproj
index 2030a51..3e50cd1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.ilproj
index 41dad73..040d809 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/sehhandlerbeforetry_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/testeit_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/testeit_d.ilproj
index c8dd593..06af301 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/testeit_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/testeit_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/testeit_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/testeit_r.ilproj
index 5a076e7..954ad33 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/testeit_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/testeit_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.ilproj
index 5ac5594..cba4560 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.ilproj
index 52118cb..d0e2014 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/trybodyinbetweencatchhandlers_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.ilproj
index 59f21ef..1a898e2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.ilproj
index 59a68b6..e29e59c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/disconnected/tryfinallyincatchtry_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj
index d8a7f96..c8078e8c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj
index 5345e26..2e33aad 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj
index 526a76d..8dbbbde 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj
index cb07f27..2bd8342 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_cs_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj
index 11087a1..01f9406 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj
index 0277486..4f8135c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/catchrettoinnertry_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_d.csproj
index 66e396a..5327261 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_do.csproj
index f31eb94..920d0d0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_r.csproj
index abf76cf..cdd77fc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_ro.csproj
index 750200d..2ba3982 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/localgotoinahandler_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_d.csproj
index 03b58e6..7e3c9a4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_do.csproj
index 16cc616..1b7e426 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_r.csproj
index c7167a9..a050bc5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_ro.csproj
index 3ef2da6..bbe1123 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/loopinfinally_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.ilproj
index a2edbdd..fe89f53 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.ilproj
index 2e09ac8..d722924 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nestedfinallycall_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_d.csproj
index 07a76f1..99a2c37 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_do.csproj
index 7829b05..ab107d7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_r.csproj
index 27e9198..9349074 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_ro.csproj
index d73de45..fb3b756 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittobeginningoftry_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.ilproj
index d95eb6d..e4cb544 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.ilproj
index 7e5f198..2a145bb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalexittonestedsibling_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_d.csproj
index 867f22b..dc4be28 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_do.csproj
index 2ff8c3d..0125266 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_r.csproj
index 1a2b9c4..a6ada38 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_ro.csproj
index 592814f..bd57ebc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/nonlocalgotoinatryblockinahandler_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_d.csproj
index 8729eb1..5ac4c1e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_do.csproj
index ae2bd0d..b6b1231 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_r.csproj
index 1e82a5c..f8bec68 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_ro.csproj
index 382c6ac..e5d9ce7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexit_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_d.csproj
index 96163b6..1091ce3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_do.csproj
index d6c870f..7ee7804 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_r.csproj
index 83055d4..79da0c8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_ro.csproj
index 197a27c..e3cfc7b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/simplenonlocalexitnestedintrycatch_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_d.csproj
index a7a0e17..75dc394 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_do.csproj
index 2babc82..fd5e175 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_r.csproj
index 4bb8f71..a32ae99 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_ro.csproj
index 42414ab..42a9c4f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/switchincatch_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_d.csproj
index 44283df..b8a3e80 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_do.csproj
index dbe4e24..3bdc4ef 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_r.csproj
index abd2861..eb25656 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_ro.csproj
index 46bb440..3756180 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit1_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_d.csproj
index c52d66a..a1b7fda 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_do.csproj
index d0edd67..70e8ef3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_r.csproj
index 723c732..7c955e8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_ro.csproj
index fa960a1..634719b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit2_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_d.csproj
index df847c5..b2ad2c5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_do.csproj
index 8517ebe..f01c5af 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_r.csproj
index 2bbce32..686b67d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_ro.csproj
index 30142ac..363b5d3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit3_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_d.csproj
index 64aa116..67e03e1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_do.csproj
index 29ae443..57c8b59 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_r.csproj
index 19e7e0b..b6e5b58 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_ro.csproj
index 9a8eefe..eab85a7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryCatchFinallyThrow_nonlocalexit4_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_d.csproj
index 94792c2..ccd8d55 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_do.csproj
index 5523479..0dc6138 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_r.csproj
index a271222..c0e651f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_ro.csproj
index eda2d3a..dcf0c00 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/finallyexec/tryfinallythrow_nonlocalexit_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_d.csproj
index e28b2fc..ea3a8dd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_do.csproj
index 822443d..92b900f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_r.csproj
index 8027721..dc54d50 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_ro.csproj
index 78699be..6458ba6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/generics/throwincatch_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_d.csproj
index 9fa2472..da0deea 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_do.csproj
index 5bc31c0..412929e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_r.csproj
index e939f74..421d482 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_ro.csproj
index e54b318..507bfed 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchnestedtype_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_d.csproj
index 7d3178a..1f46020 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_do.csproj
index 660587a..f35ab8f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_r.csproj
index b60a1bf..d2c317a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_ro.csproj
index 0edc3ed..05dcf98 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/generics/trycatchsimpletype_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/ehso.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/ehso.csproj
index 7120c59..8f5f579 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/ehso.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/ehso.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_d.csproj
index baff214..a6acacc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_do.csproj
index 449e66a..66129bf 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_r.csproj
index 5f764b3..326c007 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_ro.csproj
index 6853642..79550b1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/gcincatch_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_d.csproj
index 816fb0a..69df803 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_do.csproj
index 7e0549d..75eb092 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_r.csproj
index 1173f04..2962405 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_ro.csproj
index 432cb04..847c947 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/rangecheckinfinally_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj
index 2a3bc61..f0d02ee 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_d.csproj
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj
index d94cd6ba..c29d519 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_do.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj
index af8eba0..6853407 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_r.csproj
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj
index 8734a14..e292093 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/strswitchfinal_ro.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_d.csproj
index b85cf22..e47ca81 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_do.csproj
index caf99b9..81f3c36 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_r.csproj
index 484fdd1..3c7bbd0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_ro.csproj
index 3f5bea6..9cf876f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/switchinfinally_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_d.ilproj
index 1d83303..1ba928f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_r.ilproj
index 297d9eb..d8268ab 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw1dimarray_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_d.ilproj
index 5a6877c..00bfc4f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_r.ilproj
index 419bfc8..af78ae4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/throw2dimarray_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/volatilefromfinally.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/volatilefromfinally.csproj
index f951e6b..bfccbd8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/interactions/volatilefromfinally.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/interactions/volatilefromfinally.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_d.ilproj
index 568334e..f84e943 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_r.ilproj
index e6cd649..eee8236 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/2branchesoutoftry_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_d.ilproj
index 729ec68..6963ae6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_r.ilproj
index b100225..3dc8ad9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/backwardleaveincatch_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.ilproj
index 02bd45a..158fe63 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.ilproj
index 1bd5c1e..9ff18cd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithcatch_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.ilproj
index 51c2611..b842284 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.ilproj
index 11c6c43..ad62074 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchbackwardswithfinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.ilproj
index 3d4f234..d494076 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.ilproj
index c4067c6..1e956aa 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutofnestedtryfinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.ilproj
index 6e56011..b6927dd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.ilproj
index 8354d05..c658e7a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/branchoutoftryfinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_d.csproj
index 8856952..288a030 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_do.csproj
index 5c3e1cf..816b9e6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_r.csproj
index 0048f8f..c43004d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_ro.csproj
index 927fe1f..56a38a0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/catchretnonlocalexitinfunclet_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_d.ilproj
index 83eb805..4dc7b38 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_r.ilproj
index e83dd91..21d007d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/forwardleaveincatch_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_d.ilproj
index 9fc6eca..ab10187 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_r.ilproj
index dc73013..fb1003c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeforefinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_d.ilproj
index fbde21e..bda0c66 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_r.ilproj
index 7091a17..c3a65f0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/labelbeginningfinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_d.ilproj
index 4e948ff..6386ada 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_r.ilproj
index 13f2c45..9bd2b60 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveinsameregion_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_d.ilproj
index dd12873..81dccd1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_r.ilproj
index f601534..6176b54 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/leaveintotrybody_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_d.csproj
index cea9853..ad5cf11 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_do.csproj
index bf438b5..e6630de 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_r.csproj
index 20538c3..45a1f2e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_ro.csproj
index 1d37d3a..329d7be 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/nonlocalexitfromnestedcatch_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_d.csproj
index 1d01cfa..754c5b9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_do.csproj
index 0e45a47..9350aa7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_r.csproj
index 453d939..3b60f29 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_ro.csproj
index 5f51019..c5e9add 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/oponerror_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.ilproj
index a147843..678070b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.ilproj
index 34de919..98cdc05 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyintrycatchwithleaveintotry_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_d.csproj
index 01ea7c2..98b840c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_do.csproj
index da57ea5..094582f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_r.csproj
index 33b1408..c550000 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_ro.csproj
index 06c45b0..408c4e0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/leaves/tryfinallyloop_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.ilproj
index d292b27..810fd5e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.ilproj
index 68964f0..525fa98 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/catchfiltercatch_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.ilproj
index 30e2126..bb89905 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.ilproj
index 1c5e700..e70c4dd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/mixedhandler/filterfiltercatchcatch_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_d.ilproj
index 06046ed..34ae075 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_r.ilproj
index 34f0a7c..4d3e536 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedcatch_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.ilproj
index 264b0de..04df01a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.ilproj
index f7d302e..9a1cd8c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/cascadedexcept_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.ilproj
index a738439..7daa1bb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.ilproj
index e9a648d..70d7588 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatch_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.ilproj
index 671607c..0c3793c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.ilproj
index 055719b..a9723da 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedcatchnofin_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.ilproj
index c630a40..65f1cb7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.ilproj
index a68752d..a32e7f5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexcept_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.ilproj
index 1d1894a..d7e7c71 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.ilproj
index 21214a7..ef192c2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/cascadedcatchret/throwincascadedexceptnofin_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_d.csproj
index 1456424..f612689 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_do.csproj
index ad2c19e..d7599a1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_r.csproj
index 98d15bf..f9d3135 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_ro.csproj
index f385476..aa8b5f6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/cascadedcatch_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_d.ilproj
index efe44a8..b52dfae 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_r.ilproj
index 75987dd..177f015 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/localvarincatch_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_d.csproj
index 7a261f2..a526a18 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_do.csproj
index 6c3fa2f..7725048 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_r.csproj
index 61568eb..970f3af 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_ro.csproj
index ed91139..e4eac88 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/methodthrowsinfinally_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_d.csproj
index b954b27..a9a152a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_do.csproj
index 8589e17..b129102 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_r.csproj
index f9f4583..59b2984 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_ro.csproj
index 84913db..fdd4c77 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/rethrowincatchnestedinfinally_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_d.csproj
index 148a89d..3646278 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_do.csproj
index 16e3415..7f4be33 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_r.csproj
index 48b6dd5..6d0e665 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_ro.csproj
index 7ca9424..85b804a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinally_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_d.csproj
index 209b773..6bda5ac 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_do.csproj
index 6036595..fd61b6c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_r.csproj
index 2601c45..0ca8ac8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_ro.csproj
index 26c68e5..af63d93 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinfinallynestedintry_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.ilproj
index edc50fe..84d9292 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.ilproj
index 8f64f51..5b06d37 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedcatch_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_d.csproj
index 838d578..675b63c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_do.csproj
index fd0a6ad..d79bc72 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_r.csproj
index beeaeca..bd2fdbc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_ro.csproj
index c65fd14..314fe3a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/throwinnestedfinally_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_d.csproj
index daf8db6..ced83f0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_do.csproj
index b7d0348..9b4d9f5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_r.csproj
index 7349e7c..76a7462 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_ro.csproj
index ba7baf2..93a3eb3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/general/trycatchintryfinally_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.ilproj
index aa08eba..4b7fd89 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.ilproj
index dfcc2e9..733072a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtrycatch_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.ilproj
index 4e6e866..c46fd85 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.ilproj
index ff3c560..924d0ff 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryexcept_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.ilproj
index 4734ad5..8150e92 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.ilproj
index 7502cac..6f32de8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfault_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.ilproj
index c72d11e..ac3c7a2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.ilproj
index bd7ae99..1cf5b73 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/nestedtryfinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.ilproj
index bf0e9b4..4f43848 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.ilproj
index 7e23cb8..1c04c00 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtrycatch_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.ilproj
index a1531ce..bfb2620 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.ilproj
index f5771e7..277dfea 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryexcept_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.ilproj
index 0ac17c2..716f596 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.ilproj
index bf47b306..0b6d03e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfault_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.ilproj
index 2cf222b..2319f0d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.ilproj
index bb94095..1f5f708 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nestedtry/throwinnestedtryfinally_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_d.csproj
index c730c31..fc1e1ac 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_do.csproj
index 15fa393..183963c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_r.csproj
index a40d935..77fb9d8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_ro.csproj
index 4baf4d6..2bc3282 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinally_50_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_d.csproj
index 25d3ce5..1ff9702 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_do.csproj
index 1bdcd2f..296d0ae 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_r.csproj
index 193d24b..6ee2a44 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_ro.csproj
index a9bbbe4..32474f2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallynestedintry_30_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_d.csproj
index 606b7eb..1aa224e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_do.csproj
index f258fb7..099b7a4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_r.csproj
index d656af1..d0f2e3e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_ro.csproj
index 0e9eb69..972fb41 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/nested/nonlocalexit/throwinfinallyrecursive_20_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.csproj
index 18cfa5b..f8dd93f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/122239/outermostFinally.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_d.csproj
index aa84748..2aae07b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_do.csproj
index d3c3af4..6be75f2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_r.csproj
index cc26068..3368e41 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_ro.csproj
index 2cfec2c..46dbaae 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/140713/innerFinally_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_d.csproj
index 2d54aca..8959aeb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_do.csproj
index d8129df..03a62c1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_r.csproj
index ac4d261..f3f4a39 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_ro.csproj
index 232fd87..f944749 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/regress/asurt/141358/uncaughtException_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.csproj
index 690d43d..2c14e67 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.csproj
index fdf84f5..f3df58f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/regress/vswhidbey/148190/baduwinfo1.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\..\..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_d.csproj
index ea2ffb5..d68cbb0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_do.csproj
index 3753b34..0f9d0a6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_r.csproj
index 2fa1428..1a17baa 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_ro.csproj
index a71a2a2..6e63491 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyaftercatch_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.ilproj
index 1eb3d02..33d5c6e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_d.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.ilproj
index 9bccac5..3f8f85a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/rethrowinfinallyinsidecatch_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_d.csproj
index 09c348d..002398e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_do.csproj
index cd41840..1646993 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_r.csproj
index d6e85df..c5c1031 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_ro.csproj
index 627dd8a..25104ec 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samerethrowtwice_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_d.csproj
index 1bb95fa..de0c521 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_do.csproj
index 8e3de6b..c88afa6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_r.csproj
index dedd716..f1848e8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_ro.csproj
index 6e90fb3..83eec64 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/samethrowtwice_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_d.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_d.csproj
index c387a63..9a0a7cd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_do.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_do.csproj
index 7993eb2..b480572 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_r.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_r.csproj
index 22a2d73..b9be5e4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_ro.csproj
index 4e3aa3c..01d3122 100644
--- a/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/eh/rethrow/simplerethrow_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_c.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_c.csproj
index 4f3c519..3f6db78 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_c.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_c.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f4.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f4.csproj
index 21c5ad3..9c97b04 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f8.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f8.csproj
index 9851ea7..bbf9cb2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f8.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_f8.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i1.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i1.csproj
index 25a54b6..4ec1625 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i2.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i2.csproj
index 14d98a3..86d800b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i4.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i4.csproj
index 3bbef8d..5324de9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_i4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_o.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_o.csproj
index 1ecb570..022db8e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_o.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_s.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_s.csproj
index f031d48..5c14694 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_s.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_dbgrefarg_s.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_c.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_c.csproj
index 326fcf2..892c61c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_c.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_c.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f4.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f4.csproj
index 6ae8661..e7c4b47 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f8.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f8.csproj
index 0b3bd4d..d3ba1e0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f8.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_f8.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i1.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i1.csproj
index 1c6200a..c95f556 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i2.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i2.csproj
index c8a54c1..2b4d7dc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i4.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i4.csproj
index 87b1c4a..bab7061 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_i4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_o.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_o.csproj
index b3452fc..ab1087f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_o.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_s.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_s.csproj
index f2fe870..bc61c18 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_s.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_dbgrefarg_s.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_c.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_c.csproj
index 4aa56ac..8dea508 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_c.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_c.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f4.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f4.csproj
index 2a74cc9..d231826 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f8.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f8.csproj
index 44565ac..e4c6f17 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f8.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_f8.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i1.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i1.csproj
index 2d86fa2..f9a9c0b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i2.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i2.csproj
index 57bcbd1..c0fbc65 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i4.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i4.csproj
index 037ef3c..e847e73 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_i4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_o.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_o.csproj
index 4edde6a..37137e3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_o.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_s.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_s.csproj
index a811fa0..74facd4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_s.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_opt_relrefarg_s.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_c.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_c.csproj
index c3855a4..ccdf60b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_c.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_c.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f4.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f4.csproj
index 865b036..f95dc37 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f8.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f8.csproj
index 91f5344..0051eaa 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f8.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_f8.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i1.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i1.csproj
index 072e9d6..6fe2565 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i2.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i2.csproj
index 5e17a7b..58c844f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i4.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i4.csproj
index 6ad196b..2a50947 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_i4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_o.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_o.csproj
index fa209a0..eb1c417 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_o.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_s.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_s.csproj
index c0f36d0..957c47e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_s.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/basic/_relrefarg_s.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit1.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit1.csproj
index acaee30..273a075 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit2.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit2.csproj
index 2475f34..1f8ea68 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit3.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit3.csproj
index 5e59c15..6302f1e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit4.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit4.csproj
index f365b67..3d152ce 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit5.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit5.csproj
index 4be4e50..7e309d6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit5.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit5.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit6.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit6.csproj
index 9341d7f..6bae7c2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit6.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit6.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit7.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit7.csproj
index 094c363..da2a583 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit7.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit7.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit8.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit8.csproj
index cf12b56..deabcb1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit8.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_dbgexplicit8.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_f8.ilproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_f8.ilproj
index 6ce3c57..5cf7114 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_f8.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_il_dbgrefarg_box_f8.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_f8.ilproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_f8.ilproj
index 51cc856..c74f66b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_f8.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_il_relrefarg_box_f8.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit1.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit1.csproj
index 6692b94..8b42d97 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit2.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit2.csproj
index 1d27647..c177d20 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit3.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit3.csproj
index ed566b2..8c99613 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit4.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit4.csproj
index d5691b4..b9a751a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit5.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit5.csproj
index 635b20e..b21c980 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit5.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit5.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit6.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit6.csproj
index 6fce56f..5572cef 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit6.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit6.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit7.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit7.csproj
index 83a965d..af212e9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit7.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit7.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit8.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit8.csproj
index 4574362..6f87f99 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit8.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_dbgexplicit8.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit1.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit1.csproj
index ae4e5e8..ac791e2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit2.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit2.csproj
index b440fdc..8887472 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit3.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit3.csproj
index 99fb9e5..623ed95 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit4.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit4.csproj
index 5f32aa8..00b6ab2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit5.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit5.csproj
index 0b059be..303eede 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit5.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit5.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit6.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit6.csproj
index 107c5e8..88a9e56 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit6.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit6.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit7.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit7.csproj
index 4444856..0e11fb3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit7.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit7.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit8.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit8.csproj
index 1b36d9a..05d6fbd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit8.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_opt_relexplicit8.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit1.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit1.csproj
index 2492bef..3b35c50 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit2.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit2.csproj
index bc16317..f6e9d7f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit3.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit3.csproj
index 6f00a1b..25cab1c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit4.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit4.csproj
index 3180325..68c5223 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit5.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit5.csproj
index f4fe25c..bbca0ad 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit5.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit5.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit6.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit6.csproj
index ae8c7324..4734d05 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit6.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit6.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit7.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit7.csproj
index 20d95f1..63f4871 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit7.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit7.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit8.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit8.csproj
index 322e197..27b7f91 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit8.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/misc/_relexplicit8.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_double.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_double.csproj
index e063d63..9c06f0f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_double.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_double.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_float.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_float.csproj
index 63207a8..5d86cd1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_float.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_float.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_objref.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_objref.csproj
index 4cbab0d..bf41431 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_objref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_objref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_valref.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_valref.csproj
index 305264c..e532c7f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_valref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_dbgrotarg_valref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_double.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_double.csproj
index 543e690..220fc24 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_double.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_double.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_float.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_float.csproj
index e30320d..236663a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_float.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_float.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_objref.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_objref.csproj
index 7625193..308628a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_objref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_objref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_valref.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_valref.csproj
index 652720a..c550d83 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_valref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_dbgrotarg_valref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_double.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_double.csproj
index 74bf84a..1182dde 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_double.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_double.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_float.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_float.csproj
index f0519e1..6a0ac10 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_float.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_float.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_objref.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_objref.csproj
index eda26ce..e149a63 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_objref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_objref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_valref.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_valref.csproj
index 40d4863..a24c4714 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_valref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_opt_relrotarg_valref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_double.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_double.csproj
index 7f194e0..b19c0c7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_double.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_double.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_float.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_float.csproj
index dae35a2..10c52aa 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_float.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_float.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_objref.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_objref.csproj
index 8cc4c11..74838d2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_objref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_objref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_valref.csproj b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_valref.csproj
index 1d59773..497e87f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_valref.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/explicit/rotate/_relrotarg_valref.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug614098/intToByte.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug614098/intToByte.csproj
index 7d86f86..b711fb4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug614098/intToByte.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug614098/intToByte.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj
index 695b82b..350b168 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/ehCodeMotion.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj
index d5734d6..eb7c8ba 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/finallyclone.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.csproj
index 173cb8d..d40819a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/moduleHandleCache.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="moduleLibrary.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/moduleLibrary.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/moduleLibrary.csproj
index 7fee87c..dcfa35f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/moduleLibrary.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/moduleLibrary.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj
index b771d10..214a2d4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug619534/twoEndFinallys.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj
index 9ae243f..a53dd8d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug621705/ptuple_lost.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj
index 0c9a021..47dc8f7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/bug647189/ssa_tuIsAddr.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj
index 1403825..533458e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/arrayDim.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.ilproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.ilproj
index a60993d..c264b71 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/loopIV_init.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj
index aee96c1..f28a45a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug675304/osrAddovershot.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj
index 97232bf..962eda4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/EHCopyProp.csproj
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj
index c1e706c..72464e3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/GCOverReporting.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj
index 6453c49..2064dfa 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/castClassEH.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/dependentlifetimes.ilproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/dependentlifetimes.ilproj
index 0cb1454..6e931aa 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/dependentlifetimes.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/dependentlifetimes.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.ilproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.ilproj
index 01da435..0c0808e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/ehDescriptorPtrUpdate.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.ilproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.ilproj
index c694e26..583b70c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.ilproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.ilproj
index 38f034f..a14a0f5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/fgloop2.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj
index 519a943..31f9d68 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/sealedCastVariance.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj
index 1016a36..99b4647 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/singleRefField.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj
index 44a85f4..0e93580 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679008/zeroInitStackSlot.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.ilproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.ilproj
index b2f65b2..dd5728d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug679053/regionLive.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj
index 3eeb583..428e315 100644
--- a/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/flowgraph/dev10_bug723489/qMarkColon.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_d.csproj
index bda4e6a..da6bc7d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_d.csproj
@@ -38,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/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_do.csproj
index bc8b918..53df95e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_do.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_r.csproj
index f640e54..5a3a048 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_r.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_ro.csproj
index cb9aab6..a71bf08 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/apps/bouncingball_cs_ro.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_d.csproj
index d99daae..4a20f1f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_do.csproj
index 22a1160..dff178a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_r.csproj
index 0a1000c..99a1117 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_ro.csproj
index db68739..6950dbf 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/1000w1d_cs_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_d.csproj
index 6eec2fa..8579a15 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_do.csproj
index 1908ecc..9dbad02 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_r.csproj
index 8c2073a..20268b1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_ro.csproj
index bcf604a..383b805 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w250d_cs_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj
index a694797..58000b6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_d.csproj
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_do.csproj
index 08ab78e..fb33bc7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj
index 4b75ff4..d844f0d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_r.csproj
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_ro.csproj
index 095a469..7d71eee 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/10w5d_cs_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_d.csproj
index 56fb603..7ec7a81 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_do.csproj
index 0a68e17..8bcc2e4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_r.csproj
index 615254b..9b531bf 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_ro.csproj
index 07f2138..a11362c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-01_cs_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_d.csproj
index 433baab..26652c5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_do.csproj
index e6c8e6e..85fcc68 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_r.csproj
index ce49d90..cdcf6a3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_ro.csproj
index f02ce4e..781a31c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/200w1d-02_cs_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_d.csproj
index 3c5cf6e..963f2f4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_do.csproj
index 861073e..3d0ad71 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_r.csproj
index 3faa5fd..00d4603 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.csproj
index bd31b3e..a550758 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-01_cs_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_d.csproj
index 7f1b1be..969c55c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_do.csproj
index 6edff23..137440b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_r.csproj
index 3a7508b..ead551b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.csproj
index 41a2240..f2660ec 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/3w1d-02_cs_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_d.csproj
index 110d620..33bbd3d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_do.csproj
index 22ffa70..5d29f38 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_r.csproj
index 323ea17..a4affeb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.csproj
index 2516c8c..9c9a07e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-01_cs_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_d.csproj
index 56feba1..a89280a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_do.csproj
index f4581a3..3e7ae92 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_r.csproj
index 8237249..7dfb57d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.csproj
index e637c37..2259401 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-02_cs_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_d.csproj
index 50c8be2..50e02a7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_do.csproj
index ac96e82..9481c76 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_r.csproj
index 06bac15..cd01ef5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.csproj
index 348154dc..2f3bb61 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-03_cs_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_d.csproj
index da5e201..daa1908 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_do.csproj
index 1e82686..c75c4fc 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_r.csproj
index c514c48..a6378f3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.csproj
index ec3f3d6..d07b3f5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-04_cs_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_d.csproj
index 5488886..494d737 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_d.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_do.csproj
index 9e8ad79..2ae8fc2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_do.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_r.csproj
index beae351..44c7c29 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_r.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_ro.csproj
index 2c799c4..07f9174 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-05_cs_ro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_d.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_d.csproj
index dc0e2d2..1627c36 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_do.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_do.csproj
index 350f019..b8accc1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_r.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_r.csproj
index 0aa6c1b..cdf4174 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.csproj b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.csproj
index fa2df31..d99d277 100644
--- a/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/fp/exgen/5w1d-06_cs_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/inlining/boolean/test.csproj b/src/coreclr/tests/src/JIT/Methodical/inlining/boolean/test.csproj
index 2dc8109..69eabac 100644
--- a/src/coreclr/tests/src/JIT/Methodical/inlining/boolean/test.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/inlining/boolean/test.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/inlining/bug505642/test.csproj b/src/coreclr/tests/src/JIT/Methodical/inlining/bug505642/test.csproj
index 1c6f443..796787a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/inlining/bug505642/test.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/inlining/bug505642/test.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Methodical/inlining/dev10_bug719093/variancesmall.ilproj b/src/coreclr/tests/src/JIT/Methodical/inlining/dev10_bug719093/variancesmall.ilproj
index ae4636c..cea1449 100644
--- a/src/coreclr/tests/src/JIT/Methodical/inlining/dev10_bug719093/variancesmall.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/inlining/dev10_bug719093/variancesmall.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.csproj
index ca52d6a..c83c756 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_dbglcs_ulong.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_dbglcs_ulong.csproj
index 3b15053..df96c41 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_dbglcs_ulong.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_dbglcs_ulong.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.csproj
index 3ef7a16..9380653 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_rellcs_ulong.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_rellcs_ulong.csproj
index 7bb12c0..589e6ec 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_rellcs_ulong.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_rellcs_ulong.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_long.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_long.csproj
index ecbf298..7ba3bde 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_long.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_long.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_ulong.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_ulong.csproj
index 414e765..481da49 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_ulong.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_ulong.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_long.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_long.csproj
index cf11ef6..fc42c92 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_long.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_long.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_ulong.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_ulong.csproj
index 9b10b16..eebd8c2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_ulong.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_ulong.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/misc/_dbgbinop.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_dbgbinop.csproj
index 5c46626..68439fd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/misc/_dbgbinop.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_dbgbinop.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/misc/_dbgbox.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_dbgbox.csproj
index 9868c4f..b29e048 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/misc/_dbgbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_dbgbox.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/misc/_relbinop.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_relbinop.csproj
index 4209aa6..54fc166 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/misc/_relbinop.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_relbinop.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/misc/_relbox.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_relbox.csproj
index 32e9055..ba2c4e9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/misc/_relbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_relbox.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_dbgbinop.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_dbgbinop.csproj
index a805c71..c2bc8ed 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_dbgbinop.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_dbgbinop.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_dbgbox.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_dbgbox.csproj
index 5d58eb1..b488a48 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_dbgbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_dbgbox.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_relbinop.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_relbinop.csproj
index 295fdf0..f63831c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_relbinop.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_relbinop.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_relbox.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_relbox.csproj
index 4f233f2..7c1ba07 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_relbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/misc/_speed_relbox.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_addsub.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_addsub.csproj
index 94cfec3..e087a72 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_addsub.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_addsub.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_div.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_div.csproj
index 3de9be5..01651d9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_div.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_div.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mul.csproj
index f4015c8..d959cfb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mulovf.csproj
index 205d3ac..9a2f947 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mul.csproj
index 62303b6..81cebef 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mulovf.csproj
index 626dfd4..66ccafa 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mul.csproj
index 14f62f1..ea10b5d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mulovf.csproj
index e8dd83d..409f787 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_muldiv.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_muldiv.csproj
index 580ef43..f615904 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_muldiv.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_dbgs_muldiv.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_addsub.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_addsub.csproj
index 404a4be..bc71b32 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_addsub.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_addsub.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldc_div.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldc_div.csproj
index 0c8a8c5..abcfbb5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldc_div.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldc_div.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mul.csproj
index 9a1d937..9309c20 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mulovf.csproj
index 385f266..baad6b7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mul.csproj
index 79b55b2..0c10a70 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mulovf.csproj
index e7f6f4f..7cc08cf5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mul.csproj
index 8379c26..d5a139c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mulovf.csproj
index 833ee11..00d25e1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_muldiv.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_muldiv.csproj
index cc03d62..5de7a20 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_muldiv.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_rels_muldiv.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_addsub.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_addsub.csproj
index 888612c..fa6e24d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_addsub.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_addsub.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_div.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_div.csproj
index 5dcba16..55c7676 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_div.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_div.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mul.csproj
index ed962eb..033cbb9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mulovf.csproj
index 0102722..545be24 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mul.csproj
index 64b1f07..778e55b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mulovf.csproj
index 671de91..9ccf6ba 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mul.csproj
index 1cc15fa..f3ff0b7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mulovf.csproj
index 9475659..e5a0963 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_muldiv.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_muldiv.csproj
index f75761d..d89cf44 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_muldiv.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_muldiv.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_addsub.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_addsub.csproj
index 3e8890d..5e23b2f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_addsub.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_addsub.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_div.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_div.csproj
index 54b1803..8a6174a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_div.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_div.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mul.csproj
index 92f5e29..72707fe 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mulovf.csproj
index b35b1e5..8f1a124 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mul.csproj
index e31c866..5bbcc9f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mulovf.csproj
index d947b2b..7eb9d05 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mul.csproj
index 10b168c..f80e93a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mulovf.csproj
index 2b2b2a4..5304950 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_muldiv.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_muldiv.csproj
index 8cdb4a0..5741f97 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_muldiv.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/signed/_speed_rels_muldiv.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_dbgsuperlong.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_dbgsuperlong.csproj
index 1326fe4..76e7db7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_dbgsuperlong.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_dbgsuperlong.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.csproj
index 8301ac7..120965c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_speed_dbgsuperlong.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_speed_dbgsuperlong.csproj
index e508792..e775473 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_speed_dbgsuperlong.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_speed_dbgsuperlong.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_speed_relsuperlong.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_speed_relsuperlong.csproj
index 457ad4c..fac333a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_speed_relsuperlong.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/superlong/_speed_relsuperlong.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgaddsub.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgaddsub.csproj
index 430e376..1cd54fa 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgaddsub.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgaddsub.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mul.csproj
index dfa37b4..059e630 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mulovf.csproj
index d6f49db..34c90eb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mul.csproj
index 5716fce..7e3c7d6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mulovf.csproj
index 239d4f9..77a487e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mul.csproj
index 7f642e9..d58d0ae 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mulovf.csproj
index 4603961..478bb8a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgmuldiv.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgmuldiv.csproj
index 6ae83cc..ebceb33 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgmuldiv.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_dbgmuldiv.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.csproj
index 6d4caf9..1ffbd30 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldc_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldc_mul.csproj
index ccb7bc5..1a7c5b9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldc_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldc_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldc_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldc_mulovf.csproj
index afd0e67..01bfe98f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldc_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldc_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mul.csproj
index e18e1e4..4f3a22e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mulovf.csproj
index c1cb953..586bda6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mul.csproj
index 275b571..990d29f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mulovf.csproj
index 872763c..294316f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relmuldiv.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relmuldiv.csproj
index 98b0ae7..7ff8330 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relmuldiv.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_relmuldiv.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgaddsub.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgaddsub.csproj
index 39d425e..6b1cd3a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgaddsub.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgaddsub.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mul.csproj
index d3115b2..abd7359 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mulovf.csproj
index c4a2383..948a44e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mul.csproj
index cdf326c..8c00409 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mulovf.csproj
index 3e534cc..6d7426c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mul.csproj
index abd71a9..f0d3451 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mulovf.csproj
index cbbae39..4584296 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgmuldiv.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgmuldiv.csproj
index f94b823..6e49b22 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgmuldiv.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgmuldiv.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_reladdsub.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_reladdsub.csproj
index 4b76447..b66c05e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_reladdsub.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_reladdsub.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mul.csproj
index daf72da..5f1fec41 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mulovf.csproj
index 6fc1c8a..d44c93d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mul.csproj
index c27b6a2..c4b33e2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mulovf.csproj
index 1ed05eb..e4b958e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mul.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mul.csproj
index 8a85f02..25df3af 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mul.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mul.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mulovf.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mulovf.csproj
index 740e7eb..1240de6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mulovf.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mulovf.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relmuldiv.csproj b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relmuldiv.csproj
index 465b4e3..63f9f5d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relmuldiv.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/int64/unsigned/_speed_relmuldiv.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/jitinterface/bug603649.csproj b/src/coreclr/tests/src/JIT/Methodical/jitinterface/bug603649.csproj
index 47239ce..1cefc76 100644
--- a/src/coreclr/tests/src/JIT/Methodical/jitinterface/bug603649.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/jitinterface/bug603649.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/ldtoken/_il_dbgtypes.ilproj b/src/coreclr/tests/src/JIT/Methodical/ldtoken/_il_dbgtypes.ilproj
index 5193f3c..05c8392 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ldtoken/_il_dbgtypes.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ldtoken/_il_dbgtypes.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/ldtoken/_il_reltypes.ilproj b/src/coreclr/tests/src/JIT/Methodical/ldtoken/_il_reltypes.ilproj
index d5c95ec..f3c9139 100644
--- a/src/coreclr/tests/src/JIT/Methodical/ldtoken/_il_reltypes.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/ldtoken/_il_reltypes.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/localloc/call/call01_small.csproj b/src/coreclr/tests/src/JIT/Methodical/localloc/call/call01_small.csproj
index dbebea5..38f3bab 100644
--- a/src/coreclr/tests/src/JIT/Methodical/localloc/call/call01_small.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/localloc/call/call01_small.csproj
@@ -40,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/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/classic.csproj b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/classic.csproj
index edc4aaf..c1f8d15 100644
--- a/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/classic.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/classic.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/classic_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/classic_d.ilproj
index d53a4e7..6fea1ff 100644
--- a/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/classic_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/classic_d.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/classic_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/classic_r.ilproj
index 63391e8..7c81812 100644
--- a/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/classic_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/classic_r.ilproj
@@ -37,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/delegate.csproj b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/delegate.csproj
index 4629bfe..4dc2b2e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/delegate.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/delegate.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/delegate_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/delegate_d.ilproj
index 0a440b2..e794133 100644
--- a/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/delegate_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/delegate_d.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/delegate_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/delegate_r.ilproj
index a078219..906cbfb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/delegate_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/delegate_r.ilproj
@@ -37,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics.csproj b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics.csproj
index d591f4a..4225510 100644
--- a/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics2.csproj b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics2.csproj
index dd980a7..09c991a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics_d.ilproj b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics_d.ilproj
index 3cc6e30..1299d28 100644
--- a/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics_d.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics_d.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics_r.ilproj b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics_r.ilproj
index 7ddd6a6..cf8ad66 100644
--- a/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics_r.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/generics_r.ilproj
@@ -37,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/tailcall.csproj b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/tailcall.csproj
index ea35539..551e1c1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/tailcall.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/tailcall.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/valuetype.csproj b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/valuetype.csproj
index 0fc0e02..b5268c6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/valuetype.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/nonvirtualcall/valuetype.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/refany/_dbggcreport.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_dbggcreport.csproj
index 99ecf7d..5f8fe0d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_dbggcreport.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_dbggcreport.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/_dbgnative.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_dbgnative.csproj
index 6ae6bb2..254eb56 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_dbgnative.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_dbgnative.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/_dbgstress1.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_dbgstress1.csproj
index 5bdcef7..7bab711 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_dbgstress1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_dbgstress1.csproj
@@ -40,10 +40,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/src/coreclr/tests/src/JIT/Methodical/refany/_dbgstress3.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_dbgstress3.csproj
index e644c2d..9a0f3f1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_dbgstress3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_dbgstress3.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj
index ca8d50e..68cc9d4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_dbgvirtcall.csproj
@@ -40,10 +40,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/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbgformat.ilproj b/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbgformat.ilproj
index c9891b7..09e5482 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbgformat.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbgformat.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbgindcall.ilproj b/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbgindcall.ilproj
index ff0c087..26986c9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbgindcall.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbgindcall.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbglcs.ilproj b/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbglcs.ilproj
index 5587762..6d206a1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbglcs.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbglcs.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbglongsig.ilproj b/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbglongsig.ilproj
index 7388580..f43232a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbglongsig.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbglongsig.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbgshortsig.ilproj b/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbgshortsig.ilproj
index cc613b6..c6aa454 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbgshortsig.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_il_dbgshortsig.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/refany/_il_relformat.ilproj b/src/coreclr/tests/src/JIT/Methodical/refany/_il_relformat.ilproj
index ec01309..8300d65 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_il_relformat.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_il_relformat.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/refany/_il_relindcall.ilproj b/src/coreclr/tests/src/JIT/Methodical/refany/_il_relindcall.ilproj
index cca9949..4339059 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_il_relindcall.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_il_relindcall.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/refany/_il_rellcs.ilproj b/src/coreclr/tests/src/JIT/Methodical/refany/_il_rellcs.ilproj
index 18fe180..7d0a2ad 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_il_rellcs.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_il_rellcs.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/refany/_il_rellongsig.ilproj b/src/coreclr/tests/src/JIT/Methodical/refany/_il_rellongsig.ilproj
index d236903..a7d19f7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_il_rellongsig.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_il_rellongsig.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/refany/_il_relshortsig.ilproj b/src/coreclr/tests/src/JIT/Methodical/refany/_il_relshortsig.ilproj
index 17ba69e..e2f475b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_il_relshortsig.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_il_relshortsig.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/refany/_relgcreport.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_relgcreport.csproj
index 8bb276c..c90b344 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_relgcreport.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_relgcreport.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/_relnative.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_relnative.csproj
index 425c1c3..ccc2c09 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_relnative.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_relnative.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/_relstress1.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_relstress1.csproj
index c38c2e3..6c465a1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_relstress1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_relstress1.csproj
@@ -40,10 +40,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/src/coreclr/tests/src/JIT/Methodical/refany/_relstress3.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_relstress3.csproj
index 65b913b..df8eabb 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_relstress3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_relstress3.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/_relvirtcall.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_relvirtcall.csproj
index 9688961..5dca8f4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_relvirtcall.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_relvirtcall.csproj
@@ -40,10 +40,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/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj
index d64a580..fac6b45 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbggcreport.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj
index 6b817d4..6690907 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgnative.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj
index b3087cc..59c01f8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgstress1.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj
index c83fd05..91ee169 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgstress3.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj
index 3dcb57f..cd70981 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_dbgvirtcall.csproj
@@ -40,10 +40,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/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj
index 0d32f3c..36360de 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relgcreport.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relnative.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relnative.csproj
index 6554066..4be7309 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relnative.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relnative.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj
index c0e3399..3b38926a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relstress1.csproj
@@ -40,10 +40,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/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj
index 0d7afa8..59450d9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relstress3.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj
index 552cd09..aa29222 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/_speed_relvirtcall.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/array1.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/array1.csproj
index cf3fbc8..aa87df7 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/array1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/array1.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/array2.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/array2.csproj
index 5421e79..21a5b25 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/array2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/array2.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/format.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/format.csproj
index 03e9b3a..3bee45c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/format.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/format.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/gcreport.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/gcreport.csproj
index cfe0053..d9b1d6c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/gcreport.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/gcreport.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/lcs.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/lcs.csproj
index cb63f53..7ad6c03 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/lcs.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/lcs.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/native.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/native.csproj
index 23ef189..6393475 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/native.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/native.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/refany/virtcall.csproj b/src/coreclr/tests/src/JIT/Methodical/refany/virtcall.csproj
index 1b1fd04..ccb4018 100644
--- a/src/coreclr/tests/src/JIT/Methodical/refany/virtcall.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/refany/virtcall.csproj
@@ -40,10 +40,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/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpleb207621.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpleb207621.csproj
index 7054186..cd1f916 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpleb207621.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpleb207621.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpletest1.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpletest1.csproj
index 2fd73f5..810ae8f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpletest1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpletest1.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpletest2.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpletest2.csproj
index 2c8b3fe..e49ea82 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpletest2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpletest2.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpletest4.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpletest4.csproj
index b90478c..3f87294 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpletest4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/_Simpletest4.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest1-xassem.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest1-xassem.csproj
index b83cced..4fe32c6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest1-xassem.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest1-xassem.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest2-xassem.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest2-xassem.csproj
index 79470a2..a062401 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest2-xassem.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest2-xassem.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest4-xassem.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest4-xassem.csproj
index 982faa0..2cc7b7b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest4-xassem.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XAssemblytest4-xassem.csproj
@@ -39,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/src/coreclr/tests/src/JIT/Methodical/stringintern/_XModuletest1-xmod.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XModuletest1-xmod.csproj
index d1edd06..a37ccf5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/_XModuletest1-xmod.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XModuletest1-xmod.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="teststr.csproj" />
     <ProjectReference Include="testgenstr.csproj" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/stringintern/_XModuletest2-xmod.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XModuletest2-xmod.csproj
index 6baa9e8..cad99b8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/_XModuletest2-xmod.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XModuletest2-xmod.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="teststr.csproj" />
     <ProjectReference Include="testgenstr.csproj" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/stringintern/_XModuletest4-xmod.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XModuletest4-xmod.csproj
index 1631c3f..fbfb5de 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/_XModuletest4-xmod.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/_XModuletest4-xmod.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="teststr.csproj" />
     <ProjectReference Include="testgenstr.csproj" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/stringintern/test1-xassem.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/test1-xassem.csproj
index 51e2b36..cbf796a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/test1-xassem.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/test1-xassem.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="teststr.csproj" />
     <ProjectReference Include="testgenstr.csproj" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/stringintern/test2-xassem.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/test2-xassem.csproj
index 27f0f6a..82757da 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/test2-xassem.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/test2-xassem.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="teststr.csproj" />
     <ProjectReference Include="testgenstr.csproj" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/stringintern/test4-xassem.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/test4-xassem.csproj
index b6e560d..c0471ff 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/test4-xassem.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/test4-xassem.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="teststr.csproj" />
     <ProjectReference Include="testgenstr.csproj" />
diff --git a/src/coreclr/tests/src/JIT/Methodical/stringintern/testgenstr.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/testgenstr.csproj
index 5292417..e6e094b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/testgenstr.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/testgenstr.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/stringintern/teststr.csproj b/src/coreclr/tests/src/JIT/Methodical/stringintern/teststr.csproj
index 6132ab0..27509ad 100644
--- a/src/coreclr/tests/src/JIT/Methodical/stringintern/teststr.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/stringintern/teststr.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/structs/valuetuple.csproj b/src/coreclr/tests/src/JIT/Methodical/structs/valuetuple.csproj
index 29e21c5..824d1a6 100644
--- a/src/coreclr/tests/src/JIT/Methodical/structs/valuetuple.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/structs/valuetuple.csproj
@@ -33,10 +33,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>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Methodical/switch/switch1.ilproj b/src/coreclr/tests/src/JIT/Methodical/switch/switch1.ilproj
index 5416bd3..d716b52 100644
--- a/src/coreclr/tests/src/JIT/Methodical/switch/switch1.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/switch/switch1.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/switch/switch10.ilproj b/src/coreclr/tests/src/JIT/Methodical/switch/switch10.ilproj
index 86c1b99..510f24c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/switch/switch10.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/switch/switch10.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/switch/switch11.ilproj b/src/coreclr/tests/src/JIT/Methodical/switch/switch11.ilproj
index 383fcef..c07e7c3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/switch/switch11.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/switch/switch11.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/switch/switch2.ilproj b/src/coreclr/tests/src/JIT/Methodical/switch/switch2.ilproj
index 480513e..411da4e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/switch/switch2.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/switch/switch2.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/switch/switch3.ilproj b/src/coreclr/tests/src/JIT/Methodical/switch/switch3.ilproj
index 0580915..1b7dad8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/switch/switch3.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/switch/switch3.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/switch/switch4.ilproj b/src/coreclr/tests/src/JIT/Methodical/switch/switch4.ilproj
index 4b964ec..b461a3e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/switch/switch4.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/switch/switch4.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/switch/switch5.ilproj b/src/coreclr/tests/src/JIT/Methodical/switch/switch5.ilproj
index 4e0448e..081e647 100644
--- a/src/coreclr/tests/src/JIT/Methodical/switch/switch5.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/switch/switch5.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/switch/switch6.ilproj b/src/coreclr/tests/src/JIT/Methodical/switch/switch6.ilproj
index 3632ae2..7dafe0c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/switch/switch6.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/switch/switch6.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/switch/switch7.ilproj b/src/coreclr/tests/src/JIT/Methodical/switch/switch7.ilproj
index 57cd945..283a87c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/switch/switch7.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/switch/switch7.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/switch/switch8.ilproj b/src/coreclr/tests/src/JIT/Methodical/switch/switch8.ilproj
index 118cfde..1657790 100644
--- a/src/coreclr/tests/src/JIT/Methodical/switch/switch8.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/switch/switch8.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/switch/switch9.ilproj b/src/coreclr/tests/src/JIT/Methodical/switch/switch9.ilproj
index 7875714..ba1f09c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/switch/switch9.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/switch/switch9.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/Desktop/_il_relthread-race.csproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/Desktop/_il_relthread-race.csproj
index d55824a..37e25e2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/Desktop/_il_relthread-race.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/Desktop/_il_relthread-race.csproj
@@ -38,10 +38,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8.ilproj
index a220f2b..448a6c8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8_inl.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8_inl.ilproj
index d1656f6..4bda2ef 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8_inl.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r4_r8_inl.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4.ilproj
index 2f7b737..a638fb9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4_inl.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4_inl.ilproj
index f2a3ed8..5c72fbe 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4_inl.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgcompat_r8_r4_inl.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgpointer.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgpointer.ilproj
index 12e27a7..b2eb68d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgpointer.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgpointer.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgpointer_i.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgpointer_i.ilproj
index ee2c646..8089811 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgpointer_i.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgpointer_i.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep_void.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep_void.ilproj
index d43acbe..e908eac 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep_void.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgrecurse_ep_void.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgtest_implicit.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgtest_implicit.ilproj
index 1d46865..1f515f9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgtest_implicit.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgtest_implicit.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgtest_void.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgtest_void.ilproj
index bfb4eaf..2c0ef67 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgtest_void.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_dbgtest_void.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8.ilproj
index 714783b..db6953d 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8_inl.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8_inl.ilproj
index 45e6f40..75f0b30 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8_inl.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r4_r8_inl.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4.ilproj
index 247de06..669981b 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4_inl.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4_inl.ilproj
index b592448..ba56205 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4_inl.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relcompat_r8_r4_inl.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relpointer.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relpointer.ilproj
index 5426e4c..d48d61e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relpointer.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relpointer.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relpointer_i.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relpointer_i.ilproj
index d3d0856..5e53f15 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relpointer_i.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relpointer_i.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep_void.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep_void.ilproj
index cd3d358..e9b35f1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep_void.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_relrecurse_ep_void.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_reltest_implicit.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_reltest_implicit.ilproj
index fa20222..1a7f361 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_reltest_implicit.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_reltest_implicit.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_reltest_void.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_reltest_void.ilproj
index c6b0ea9..b55f589 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_reltest_void.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall/_il_reltest_void.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj b/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj
index eb379fd..74ecf14 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/delegateParamCallTarget.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/delegatetail.ilproj b/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/delegatetail.ilproj
index 0617e31..bdcb6c5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/delegatetail.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/tailcall_v4/delegatetail.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-0.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-0.csproj
index 213babe..3b1195e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-0.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-0.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-1.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-1.csproj
index e65439a..e3a2a66 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-1.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-2.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-2.csproj
index 52c061b..ce56caa 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-2.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-3.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-3.csproj
index 07c4080..f93fe66 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-3.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-4.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-4.csproj
index 0b198bc..efaa041 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-4.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-5.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-5.csproj
index 8174baa..9ed0c3e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-5.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-5.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-6.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-6.csproj
index badcd4e..4c4d9fd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-6.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_dbgunsafe-6.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-0.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-0.csproj
index 131f748..c04b18f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-0.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-0.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-1.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-1.csproj
index f934e93..074fc33 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-1.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-2.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-2.csproj
index d63e28d..7d45121 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-2.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-3.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-3.csproj
index 1dc9e10..a535c2a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-3.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-4.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-4.csproj
index 4204259..9efdba8 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-4.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-5.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-5.csproj
index 9e86456..af9d87f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-5.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-5.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-6.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-6.csproj
index deda9df..7090517 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-6.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_relunsafe-6.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-0.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-0.csproj
index c76c263..39753b9 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-0.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-0.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-1.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-1.csproj
index aa0f473..33afb38 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-1.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-2.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-2.csproj
index 56dbe79..ae15677 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-2.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-3.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-3.csproj
index 97e53db..5e85906 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-3.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-4.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-4.csproj
index 395a948..70693a4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-4.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-5.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-5.csproj
index 0e09ad4..38cd4fa 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-5.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-5.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-6.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-6.csproj
index 46d162c..b965225 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-6.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_dbgunsafe-6.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-0.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-0.csproj
index 8b3638e..eba5142 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-0.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-0.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-1.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-1.csproj
index 3a88d5a..c79bdd5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-1.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-1.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-2.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-2.csproj
index de5b42b..d44b5f4 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-2.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-2.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-3.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-3.csproj
index 5ed9e6b8..daebc61 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-3.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-3.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-4.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-4.csproj
index 426ab92..cb50122 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-4.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-4.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-5.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-5.csproj
index 93110aa..1083d73 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-5.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-5.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-6.csproj b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-6.csproj
index e307f37..551b330 100644
--- a/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-6.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/unsafecsharp/_speed_relunsafe-6.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj
index b1eab53..b7cb361 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_dbgrefanyval.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj
index b9d0cd2..d15f116 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_il_dbglocalloc.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_il_dbglocalloc.ilproj
index e58f601..479c086 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_il_dbglocalloc.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_il_dbglocalloc.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_il_rellocalloc.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_il_rellocalloc.ilproj
index c17df3d..430f8dd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_il_rellocalloc.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_il_rellocalloc.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj
index 22df91b..cc45ef0 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_relrefanyval.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj
index 434ea1b..4539470 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj
index dd5fbe1..ea6aeb3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgrefanyval.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj
index 5e26e6f..177cbfd 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj
index 111cac0..76b196c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_relrefanyval.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj
index efde571..18b8e06 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj
index d350e3b..d11f08f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof.csproj
index 8938d5c..6f5bd3c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof32.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof32.csproj
index 1e106be..24b1e75 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof32.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof32.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof64.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof64.csproj
index bf8f42a..3e68401 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof64.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_dbgsizeof64.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj
index 0d953e7..dd2356f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof.ilproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj
index c2f3bad..9a4022a 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof32.ilproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64.ilproj
index 4e5493c..a483936 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_dbgsizeof64.ilproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj
index fd612eb..6fceeea 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof.ilproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj
index adc3c79..d88f33e 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof32.ilproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj
index 992abec..9df3e47 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_il_relsizeof64.ilproj
@@ -36,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof.csproj
index 3abd4bd..75d4a3f 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof32.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof32.csproj
index e4bb3d3..308bcea 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof32.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof32.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof64.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof64.csproj
index 3825744..2dc2e2c 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof64.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_relsizeof64.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof.csproj
index e4c28f6..7592754 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof32.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof32.csproj
index 2f9946b..3c54ba1 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof32.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof32.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof64.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof64.csproj
index fb09cba..a1f7232 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof64.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_dbgsizeof64.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof.csproj
index c7efbd1..541aff3 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof32.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof32.csproj
index 15d7995..cb903a5 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof32.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof32.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof64.csproj b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof64.csproj
index 621230c..ba0a7d2 100644
--- a/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof64.csproj
+++ b/src/coreclr/tests/src/JIT/Methodical/xxobj/sizeof/_speed_relsizeof64.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.csproj
index aef0938..b1b2e22 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b12008/b12008.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.csproj
index cabe10b..8f128ff 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M09.5-PDC/b14426/b14426.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.csproj
index ec4f62d..4717d62 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40089/b40089.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.csproj
index feee1ea..b19fcd6 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b40138/b40138.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.csproj
index a624b7a..86b551a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M11-Beta1/b45679/b45679.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.csproj
index d5c72f0..56b76c4 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b46847/b46847.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b47392/b47392.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b47392/b47392.ilproj
index 585b337..19ea18d 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b47392/b47392.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/V1-M12-Beta2/b47392/b47392.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.csproj
index 57a5aaf..4741c2e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b02353/b02353.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj
index 05587eb..81ba902 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-EJIT/v1-m10/b07847/b07847.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11490/b11490.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11490/b11490.csproj
index 15220f5..d16afb0 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11490/b11490.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b11490/b11490.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12053/b12053.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12053/b12053.csproj
index fb20b04..2b925b8 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12053/b12053.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12053/b12053.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12399/b12399.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12399/b12399.csproj
index 39a81b0..006effa 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12399/b12399.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12399/b12399.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12624/b12624.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12624/b12624.csproj
index 39d2f46..ef4a732 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12624/b12624.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12624/b12624.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12795/b12795.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12795/b12795.csproj
index 1ebb32f..0ba1614 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12795/b12795.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b12795/b12795.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13569/b13569.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13569/b13569.csproj
index 9ce80d4..18de722 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13569/b13569.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b13569/b13569.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14066/b14066.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14066/b14066.csproj
index dc37810..626486f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14066/b14066.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14066/b14066.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14077/b14077.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14077/b14077.csproj
index 64141d1..6f1d6af 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14077/b14077.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14077/b14077.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14716/b14716.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14716/b14716.csproj
index 444fde0..b3b86c2 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14716/b14716.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b14716/b14716.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15203/b15203.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15203/b15203.csproj
index 9a9e4cd..01a8aaf 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15203/b15203.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15203/b15203.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15728/b15728.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15728/b15728.csproj
index cc23a25..6824329 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15728/b15728.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b15728/b15728.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16238/b16238.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16238/b16238.csproj
index 87ee258..d66962c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16238/b16238.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16238/b16238.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16328/b16328.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16328/b16328.csproj
index 30ffdad..9df28a1 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16328/b16328.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16328/b16328.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16335/b16335.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16335/b16335.csproj
index 185ae01..a46070d 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16335/b16335.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16335/b16335.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16345/b16345.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16345/b16345.csproj
index 59a6f14..5c1d1b5 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16345/b16345.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16345/b16345.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16423/b16423.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16423/b16423.csproj
index 748663d..3642394 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16423/b16423.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b16423/b16423.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20913/b20913.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20913/b20913.csproj
index f8bcaaf..3cc6269 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20913/b20913.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b20913/b20913.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b22290/b22290.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b22290/b22290.csproj
index f04c333..0fd6fef 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b22290/b22290.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b22290/b22290.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24727/b24727.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24727/b24727.csproj
index 114eb8d..2f92192 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24727/b24727.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24727/b24727.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24728/b24728.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24728/b24728.csproj
index 9d2c3ce..6f2fd46 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24728/b24728.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b24728/b24728.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25647/b25647.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25647/b25647.csproj
index 5d6cfd1..0809a7d 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25647/b25647.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25647/b25647.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25882/b25882.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25882/b25882.csproj
index 91043ef..fb002fa 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25882/b25882.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b25882/b25882.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.ilproj
index 7770141..d2dd252 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324a.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.ilproj
index 4f4e122..1822d56 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26324/b26324b.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26558/b26558.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26558/b26558.csproj
index ff1c2c9..bfeec71 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26558/b26558.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26558/b26558.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26560/b26560.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26560/b26560.csproj
index 8e1e820..d49ad3b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26560/b26560.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26560/b26560.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26732/b26732.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26732/b26732.csproj
index 724413e..0de7e25 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26732/b26732.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26732/b26732.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26863/b26863.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26863/b26863.csproj
index 946a6ab..4d3d340 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26863/b26863.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b26863/b26863.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27811/b27811.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27811/b27811.csproj
index 300e4e8..3ae7758 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27811/b27811.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27811/b27811.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27819/b27819.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27819/b27819.csproj
index b74e4f1..87a4de8 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27819/b27819.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27819/b27819.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27824/b27824.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27824/b27824.csproj
index ed87656..d424bb7 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27824/b27824.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b27824/b27824.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28037/b28037.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28037/b28037.csproj
index 83f946f..5ca7de9 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28037/b28037.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28037/b28037.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28042/b28042.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28042/b28042.csproj
index 1dbc782..9b08616 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28042/b28042.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28042/b28042.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28776/b28776.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28776/b28776.csproj
index 457099b..3160296 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28776/b28776.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28776/b28776.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28787/b28787.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28787/b28787.csproj
index 425bfb6..e1a55d6 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28787/b28787.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28787/b28787.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28790/b28790.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28790/b28790.csproj
index f031267..8838f77 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28790/b28790.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b28790/b28790.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29068/b29068.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29068/b29068.csproj
index 92ea3ae..845751b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29068/b29068.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29068/b29068.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29456/b29456.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29456/b29456.csproj
index 7b6b8f4..335ac27 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29456/b29456.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b29456/b29456.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30126/b30126.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30126/b30126.csproj
index 4990397..89e167fc5 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30126/b30126.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30126/b30126.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30128/b30128.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30128/b30128.csproj
index 4c24c77..428f3dd 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30128/b30128.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30128/b30128.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30630/b30630.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30630/b30630.csproj
index f4d50ce3..f66d9d4 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30630/b30630.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30630/b30630.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30905/b30905.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30905/b30905.ilproj
index 443d441..4ba7dbf 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30905/b30905.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b30905/b30905.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31150/b31150.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31150/b31150.csproj
index b0c779e..f875e7f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31150/b31150.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31150/b31150.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31732/b31732.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31732/b31732.csproj
index 68352fd..8a4ac7e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31732/b31732.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31732/b31732.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31748/b31748.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31748/b31748.csproj
index 938e574..7be9b42 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31748/b31748.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31748/b31748.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31749/b31749.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31749/b31749.csproj
index b1346c5..a482752 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31749/b31749.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31749/b31749.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31763/b31763.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31763/b31763.csproj
index 9e3d486..90c1ddc 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31763/b31763.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31763/b31763.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31912/b31912.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31912/b31912.csproj
index c9ed741..e697546 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31912/b31912.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b31912/b31912.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32303/b32303.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32303/b32303.csproj
index 9752766..cf18627 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32303/b32303.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32303/b32303.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32345/b32345.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32345/b32345.csproj
index a5f61bc..769c7a2 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32345/b32345.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32345/b32345.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32560/b32560.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32560/b32560.csproj
index 00cba27..e26ba16 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32560/b32560.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32560/b32560.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32801/b32801.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32801/b32801.csproj
index 2ea2c59..189c61c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32801/b32801.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32801/b32801.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32879/b32879.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32879/b32879.ilproj
index 960a819..1db9339 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32879/b32879.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09.5-PDC/b32879/b32879.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13170/b13170.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13170/b13170.csproj
index 1e068c8..c027176 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13170/b13170.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13170/b13170.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13178/b13178.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13178/b13178.csproj
index a7d162e..218935f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13178/b13178.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13178/b13178.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.csproj
index 4ea5d44..41015b1 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13621/b13621.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13647/b13647.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13647/b13647.csproj
index 3aca4fe..535a8a7 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13647/b13647.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13647/b13647.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13944/b13944.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13944/b13944.csproj
index 2681c19..4343f71 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13944/b13944.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b13944/b13944.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14057/b14057.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14057/b14057.csproj
index d9720bb..4f4d181 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14057/b14057.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14057/b14057.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14059/b14059.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14059/b14059.csproj
index bc5cf3a..1f908aa 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14059/b14059.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14059/b14059.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14228/b14228.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14228/b14228.csproj
index 0d2d344..9f04beb 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14228/b14228.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14228/b14228.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14277/b14277.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14277/b14277.csproj
index cbc0dc3..b3dc684 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14277/b14277.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14277/b14277.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14314/b14314.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14314/b14314.csproj
index 73ac65c..5bf48dd 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14314/b14314.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14314/b14314.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14323/b14323.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14323/b14323.csproj
index bb19602..2c64f90 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14323/b14323.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14323/b14323.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14367/b14367.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14367/b14367.csproj
index 0ba319d..788db4c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14367/b14367.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14367/b14367.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14396/b14396.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14396/b14396.csproj
index f52c361..ae11b8b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14396/b14396.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14396/b14396.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14422/b14422.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14422/b14422.csproj
index b789828..34d0bec 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14422/b14422.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14422/b14422.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14428/b14428.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14428/b14428.csproj
index 74cabb8..504452f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14428/b14428.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14428/b14428.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14443/b14443.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14443/b14443.csproj
index 2f3c648..f206a1c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14443/b14443.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14443/b14443.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14475/b14475.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14475/b14475.csproj
index 62a938e..f19472e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14475/b14475.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14475/b14475.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14616/b14616.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14616/b14616.csproj
index 13dd352..3d171f1 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14616/b14616.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14616/b14616.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14624/b14624.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14624/b14624.csproj
index 685c301..c84ab58 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14624/b14624.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14624/b14624.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14640/b14640.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14640/b14640.csproj
index 0f6b067..58f3be9 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14640/b14640.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14640/b14640.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14673/b14673.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14673/b14673.csproj
index 201adc8..4c3ca9f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14673/b14673.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14673/b14673.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14779/b14779.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14779/b14779.csproj
index debf8b4..89af5b4 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14779/b14779.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b14779/b14779.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15155/b15155.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15155/b15155.csproj
index 0474445..fde695e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15155/b15155.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15155/b15155.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15307/b15307.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15307/b15307.csproj
index 9900165..668db47 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15307/b15307.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15307/b15307.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15468/b15468.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15468/b15468.csproj
index aecc56e..bd25c0a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15468/b15468.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15468/b15468.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15526/b15526.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15526/b15526.csproj
index 6e0b8da..a1a19b5 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15526/b15526.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15526/b15526.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15783/b15783.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15783/b15783.csproj
index 2cf6c12..56ceb5b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15783/b15783.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15783/b15783.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15786/b15786.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15786/b15786.csproj
index 3e4acf3..28dd65b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15786/b15786.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15786/b15786.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15797/b15797.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15797/b15797.csproj
index eb604c6..6f16189 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15797/b15797.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15797/b15797.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15864/b15864.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15864/b15864.csproj
index 1135803..0c41cb3 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15864/b15864.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b15864/b15864.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16054/b16054.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16054/b16054.ilproj
index d61d387..4f0ae07 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16054/b16054.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16054/b16054.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj
index bb5d92c..3fcdbf2 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16102/b16102.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16294/b16294.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16294/b16294.csproj
index ea8a88f..070520e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16294/b16294.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M09/b16294/b16294.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02051/b02051.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02051/b02051.csproj
index b092b50..f3c2369 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02051/b02051.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02051/b02051.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02076/b02076.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02076/b02076.csproj
index ead60eb..d14cffd 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02076/b02076.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02076/b02076.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02352/b02352.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02352/b02352.csproj
index 7919820..a52a509 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02352/b02352.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b02352/b02352.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04914/b04914.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04914/b04914.csproj
index dfe15fa..3517512 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04914/b04914.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b04914/b04914.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05477/b05477.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05477/b05477.csproj
index 49b9d9c..04540a1 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05477/b05477.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b05477/b05477.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06464/b06464.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06464/b06464.csproj
index e534629..60fa19a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06464/b06464.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06464/b06464.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06680/b06680.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06680/b06680.csproj
index 718a1bd..df7462f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06680/b06680.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06680/b06680.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06812/b06812.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06812/b06812.csproj
index 892fa1b..fe874a7 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06812/b06812.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06812/b06812.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06859/b06859.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06859/b06859.csproj
index 759d5a4..aa11a31 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06859/b06859.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06859/b06859.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06924/b06924.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06924/b06924.csproj
index dd5551d..8850ab9 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06924/b06924.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b06924/b06924.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07483/b07483.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07483/b07483.csproj
index 0250ecd..676bc6c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07483/b07483.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b07483/b07483.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08172/b08172.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08172/b08172.csproj
index eb5547a..7ba3114 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08172/b08172.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08172/b08172.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944a.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944a.csproj
index 5289dcc..4db827a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944a.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944a.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b.csproj
index 0cd8ef1..4645e5b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b08944/b08944b.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09246/b09246.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09246/b09246.csproj
index 64a883f..4056bff 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09246/b09246.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09246/b09246.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09287/b09287.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09287/b09287.csproj
index c20a77d..19547d9 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09287/b09287.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09287/b09287.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09452/b09452.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09452/b09452.csproj
index 2a50bee..831f87a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09452/b09452.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b09452/b09452.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13330/b13330.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13330/b13330.csproj
index a8a6aa9..36f5a36 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13330/b13330.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13330/b13330.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13466/b13466.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13466/b13466.csproj
index 744f27a..57f2e25 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13466/b13466.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M10/b13466/b13466.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b30586/b30586.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b30586/b30586.csproj
index 6ec0f93..971567b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b30586/b30586.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b30586/b30586.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b31878/b31878.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b31878/b31878.csproj
index 45738e4..ced7dfb 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b31878/b31878.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b31878/b31878.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b34945/b34945.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b34945/b34945.csproj
index fc19084..04e7921 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b34945/b34945.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b34945/b34945.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36274/b36274.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36274/b36274.csproj
index 9d5c6f1..ad68b7a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36274/b36274.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36274/b36274.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36332/b36332.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36332/b36332.csproj
index 7642231..8c666c7 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36332/b36332.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36332/b36332.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36470/b36470.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36470/b36470.csproj
index 62f114c..50a64db 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36470/b36470.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36470/b36470.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36471/b36471.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36471/b36471.csproj
index 41f6ebc..9f00e71 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36471/b36471.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36471/b36471.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj
index d58e606..7b57ec5 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b36472/b36472.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37131/b37131.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37131/b37131.csproj
index f2ab022..fea8737 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37131/b37131.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37131/b37131.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj
index 8e94102..cf44691 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37598/b37598.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37608/b37608.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37608/b37608.csproj
index a9b0808..89c5aab 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37608/b37608.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37608/b37608.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37636/b37636.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37636/b37636.csproj
index 4917cff..282a6eb 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37636/b37636.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b37636/b37636.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38403/b38403.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38403/b38403.csproj
index e7ec6fe..1d256c8 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38403/b38403.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38403/b38403.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38556/b38556.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38556/b38556.csproj
index db57d0f..2b2a765 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38556/b38556.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b38556/b38556.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39217/b39217.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39217/b39217.csproj
index 99a09a2..80fee59 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39217/b39217.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39217/b39217.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39224/b39224.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39224/b39224.csproj
index 87d8049..2d7f115 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39224/b39224.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39224/b39224.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39951/b39951.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39951/b39951.csproj
index bf46a9b..4f58463 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39951/b39951.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b39951/b39951.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40141/b40141.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40141/b40141.csproj
index a27ab9c..62e4c33 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40141/b40141.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40141/b40141.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40216/b40216.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40216/b40216.csproj
index 03c1b15..e2c19f9 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40216/b40216.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40216/b40216.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40221/b40221.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40221/b40221.csproj
index ed83ac3..fa4fa65 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40221/b40221.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40221/b40221.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40496/b40496.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40496/b40496.csproj
index 4cbbcfe..c9abb1d 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40496/b40496.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40496/b40496.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40521/b40521.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40521/b40521.csproj
index f337a46..2e8dab0 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40521/b40521.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b40521/b40521.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41063/b41063.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41063/b41063.csproj
index 1ec26bc..f4a479e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41063/b41063.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41063/b41063.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41234/b41234.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41234/b41234.csproj
index b7ff07a..64eb72f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41234/b41234.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41234/b41234.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41391/b41391.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41391/b41391.csproj
index fc66452..74923ee 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41391/b41391.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41391/b41391.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41470/b41470.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41470/b41470.csproj
index 61383a8..0158a16 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41470/b41470.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41470/b41470.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41488/b41488.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41488/b41488.csproj
index 4b57752..73cbf4e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41488/b41488.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41488/b41488.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41495/b41495.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41495/b41495.csproj
index 65147297..182aebd 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41495/b41495.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41495/b41495.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41621/b41621.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41621/b41621.csproj
index 2076721..48a8887 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41621/b41621.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41621/b41621.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41918/b41918.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41918/b41918.csproj
index be71af5..69897e6 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41918/b41918.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41918/b41918.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41990/b41990.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41990/b41990.csproj
index 63448c2..29c368c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41990/b41990.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b41990/b41990.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42009/b42009.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42009/b42009.csproj
index 3044ac1..463965e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42009/b42009.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42009/b42009.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42013/b42013.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42013/b42013.csproj
index 35856f9..473884e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42013/b42013.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42013/b42013.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42918/b42918.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42918/b42918.csproj
index 2dac679..cd7431a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42918/b42918.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42918/b42918.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42929/b42929.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42929/b42929.csproj
index b67604dd..9c59ca5 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42929/b42929.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b42929/b42929.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43010/b43010.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43010/b43010.csproj
index 263440f..77b3c3b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43010/b43010.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43010/b43010.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/Desktop/b43313.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/Desktop/b43313.csproj
index c2e94b7..e6b98d3 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/Desktop/b43313.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/Desktop/b43313.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/b43313.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/b43313.csproj
index a44be74..d5e7b7c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/b43313.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43313/b43313.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43719/b43719.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43719/b43719.csproj
index ea2dfa9..7c6b982 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43719/b43719.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43719/b43719.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43958/b43958.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43958/b43958.csproj
index 7a7b3c5..3a6d15c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43958/b43958.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b43958/b43958.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44193/b44193.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44193/b44193.csproj
index e3f7d3b..6977080 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44193/b44193.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44193/b44193.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44297/b44297.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44297/b44297.csproj
index 990c320..b30f525 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44297/b44297.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44297/b44297.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44410/b44410.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44410/b44410.csproj
index 82c1b71..ab9cb7b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44410/b44410.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b44410/b44410.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45015/b45015.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45015/b45015.csproj
index 8c990bc..911822b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45015/b45015.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45015/b45015.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45259/b45259.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45259/b45259.csproj
index ad181bf..28dd1c6 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45259/b45259.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45259/b45259.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45270/b45270.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45270/b45270.csproj
index 55c04fe..b922fef 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45270/b45270.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45270/b45270.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45458/b45458.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45458/b45458.csproj
index 3101a4d..85ba6e7f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45458/b45458.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45458/b45458.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45535/b45535.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45535/b45535.csproj
index 7be35c0..6810d3f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45535/b45535.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b45535/b45535.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46170/b46170.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46170/b46170.csproj
index b8e30dd..a5c202d 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46170/b46170.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46170/b46170.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46629/b46629.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46629/b46629.csproj
index df369df..521e060 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46629/b46629.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46629/b46629.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46641/b46641.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46641/b46641.csproj
index dfd49d8..5f552c1 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46641/b46641.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46641/b46641.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46649/b46649.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46649/b46649.csproj
index d2f1986..2d38afa 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46649/b46649.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46649/b46649.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj
index e3c110d..affdd69 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b46867/b46867.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47047/b47047.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47047/b47047.csproj
index dece3c8..10f53b6 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47047/b47047.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b47047/b47047.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48248/b48248.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48248/b48248.csproj
index 205d11c..255b4c8 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48248/b48248.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48248/b48248.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48797/b48797.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48797/b48797.csproj
index 9658a8d..9997563 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48797/b48797.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48797/b48797.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48805/b48805.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48805/b48805.csproj
index 79a6407..233fc53 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48805/b48805.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48805/b48805.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48864/b48864.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48864/b48864.csproj
index 66bd5c9..232114a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48864/b48864.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48864/b48864.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48872/b48872.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48872/b48872.csproj
index 9a069e6..73be584 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48872/b48872.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48872/b48872.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990a.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990a.csproj
index e643e88..ac4d298 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990a.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990a.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990b.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990b.csproj
index 5a106f8..6fb3aab 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990b.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b48990/b48990b.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49318/b49318.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49318/b49318.csproj
index 339877f..b36f8fd 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49318/b49318.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49318/b49318.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49322/b49322.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49322/b49322.csproj
index 8daa324..576e295 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49322/b49322.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49322/b49322.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49644/b49644.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49644/b49644.ilproj
index a781225..c479a80 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49644/b49644.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49644/b49644.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49717/b49717.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49717/b49717.csproj
index 8e55896..f4b6dfa7 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49717/b49717.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M11-Beta1/b49717/b49717.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b11553/b11553.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b11553/b11553.csproj
index 88f8532..3a08f27 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b11553/b11553.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b11553/b11553.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31182/b31182.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31182/b31182.csproj
index 463fb64..58ef2bc 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31182/b31182.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31182/b31182.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj
index 23b8e0b..76ec669 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31745/b31745.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31746/b31746.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31746/b31746.csproj
index b1b4fa6..476165b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31746/b31746.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31746/b31746.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31762/b31762.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31762/b31762.csproj
index 7017667..0e4a474 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31762/b31762.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31762/b31762.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31903/b31903.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31903/b31903.csproj
index 7ac21fc..7126d52 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31903/b31903.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31903/b31903.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31917/b31917.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31917/b31917.csproj
index 263f1a2..86b4ef7 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31917/b31917.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b31917/b31917.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37646/b37646.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37646/b37646.csproj
index 8e26b47..6a77e20 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37646/b37646.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b37646/b37646.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b38269/b38269.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b38269/b38269.csproj
index 5d774c8..976968b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b38269/b38269.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b38269/b38269.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b41852/b41852.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b41852/b41852.csproj
index c1c9e78..098f4f2 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b41852/b41852.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b41852/b41852.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43693/b43693.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43693/b43693.ilproj
index 2639e39..ac74fa9 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43693/b43693.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43693/b43693.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43694/b43694.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43694/b43694.ilproj
index 4d8d4bb..28b6b51 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43694/b43694.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b43694/b43694.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47975/b47975.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47975/b47975.csproj
index 3c20f80..096586d1 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47975/b47975.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b47975/b47975.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b48929/b48929.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b48929/b48929.csproj
index e2ae545..e14aa5e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b48929/b48929.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b48929/b48929.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49809/b49809.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49809/b49809.csproj
index cbae371..2ddd5e3 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49809/b49809.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b49809/b49809.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50042/b50042.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50042/b50042.csproj
index 1437d6f..77a4425 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50042/b50042.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50042/b50042.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145.csproj
index 441eff6..af40383 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145a.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145a.csproj
index aa178cd..03e221e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145a.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145a.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145b.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145b.csproj
index b2f41db..c7b5a2b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145b.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145b.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145c.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145c.csproj
index bdaefd1..7d566a2 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145c.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50145/b50145c.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50535/b50535.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50535/b50535.csproj
index a74a8b9..5b65032 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50535/b50535.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b50535/b50535.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51463/b51463.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51463/b51463.csproj
index b0c31fd..257068d 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51463/b51463.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51463/b51463.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51469/b51469.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51469/b51469.csproj
index 69ac570..94f92ce 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51469/b51469.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51469/b51469.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51565/b51565.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51565/b51565.csproj
index 22fc112..974430e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51565/b51565.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51565/b51565.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj
index 0028719..6f1f087 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51817/b51817.csproj
@@ -38,10 +38,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51870/b51870.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51870/b51870.csproj
index 13f4731..edad243 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51870/b51870.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51870/b51870.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/b51875.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/b51875.csproj
index da4542a..d833dc4 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/b51875.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b51875/b51875.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52572/b52572.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52572/b52572.csproj
index bb78438..edae354 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52572/b52572.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52572/b52572.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52578/b52578.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52578/b52578.csproj
index e19898c..1df2bc5 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52578/b52578.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52578/b52578.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj
index 2294111..00d9704 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52593/b52593.csproj
@@ -38,10 +38,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj
index 446a5de..0b65ff5 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52733/b52733.csproj
@@ -38,10 +38,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52746/b52746.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52746/b52746.csproj
index be5f551..5f5169e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52746/b52746.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52746/b52746.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52760/b52760.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52760/b52760.csproj
index cbeaef9..257c4d1 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52760/b52760.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52760/b52760.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52838/b52838.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52838/b52838.csproj
index 6b6c6ab..3ce46dc 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52838/b52838.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52838/b52838.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52839/b52839.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52839/b52839.csproj
index 371fdac..d0a9f19 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52839/b52839.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52839/b52839.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj
index 5af7b2b..2e8c139 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b52840/b52840.csproj
@@ -38,10 +38,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj
index 8ea628a9..4cb00ec 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226a.csproj
@@ -38,10 +38,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj
index bf819a6..cd6c25a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53226/b53226b.csproj
@@ -38,10 +38,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53547/b53547.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53547/b53547.csproj
index 624b9cf..0664587 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53547/b53547.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b53547/b53547.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54667/b54667.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54667/b54667.csproj
index 56a3a3f..7072ee5 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54667/b54667.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b54667/b54667.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/Desktop/b55197.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/Desktop/b55197.csproj
index f72846c..5cbb82b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/Desktop/b55197.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/Desktop/b55197.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/b55197.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/b55197.csproj
index b3739a5..902f493 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/b55197.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b55197/b55197.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56149/b56149.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56149/b56149.csproj
index 7661fa1..4143521 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56149/b56149.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56149/b56149.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56154/b56154.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56154/b56154.csproj
index 46b7328..2360110 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56154/b56154.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56154/b56154.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56159/b56159.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56159/b56159.csproj
index f129707..47104bb 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56159/b56159.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56159/b56159.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56772/b56772.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56772/b56772.csproj
index 86ce367..e97a8b2 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56772/b56772.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b56772/b56772.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.csproj
index 4f45792..bc55cc5 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59297/b59297.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59546/b59546.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59546/b59546.ilproj
index 06a9f70..be825cd 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59546/b59546.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59546/b59546.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59678/b59678.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59678/b59678.ilproj
index 44fc7d9..28ac9e9 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59678/b59678.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59678/b59678.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59899/b59899.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59899/b59899.csproj
index 2708eb5..e91f425 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59899/b59899.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b59899/b59899.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60600/b60600.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60600/b60600.csproj
index d74ef16..919745a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60600/b60600.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60600/b60600.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60723/b60723.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60723/b60723.csproj
index 6846060..4de58d2 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60723/b60723.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b60723/b60723.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61028/b61028.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61028/b61028.csproj
index d2f6ec4..cb21bdd 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61028/b61028.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61028/b61028.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61515/b61515.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61515/b61515.csproj
index 5bca83a..2a8298d 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61515/b61515.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61515/b61515.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61640/b61640.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61640/b61640.csproj
index feaa5c7..6e72584 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61640/b61640.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b61640/b61640.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62498/b62498.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62498/b62498.csproj
index 7926edf..7c95127 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62498/b62498.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62498/b62498.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62555/b62555.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62555/b62555.csproj
index c69eb43..a52422c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62555/b62555.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62555/b62555.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62892/b62892.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62892/b62892.csproj
index c8acffc..a2b51a6 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62892/b62892.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b62892/b62892.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63183/b63183.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63183/b63183.csproj
index 76d06e9..a8bd2ea 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63183/b63183.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63183/b63183.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63743/b63743.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63743/b63743.ilproj
index e54568c..7751bbb 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63743/b63743.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b63743/b63743.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64579/b64579.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64579/b64579.csproj
index 27ed53c..742108f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64579/b64579.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b64579/b64579.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.ilproj
index 91408f2..72782c6 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b65423/b65423.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj
index 2fd73d0..d6e957f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b66533/b66533.csproj
@@ -38,10 +38,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67414/b67414.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67414/b67414.csproj
index e10e370..2619dc3 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67414/b67414.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b67414/b67414.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68361/b68361.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68361/b68361.csproj
index f3ac5a1..879e7f3 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68361/b68361.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68361/b68361.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68634/b68634.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68634/b68634.csproj
index 5dd213f..3621ffc 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68634/b68634.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68634/b68634.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68757/b68757.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68757/b68757.ilproj
index fd3cb70..8589a30 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68757/b68757.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b68757/b68757.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71005/b71005.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71005/b71005.csproj
index 3ad64fd..4762852 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71005/b71005.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71005/b71005.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71093/b71093.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71093/b71093.csproj
index a219e7f..3b9c542 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71093/b71093.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71093/b71093.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71099/b71099.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71099/b71099.csproj
index 7fc4007..c5965a3 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71099/b71099.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71099/b71099.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71120/b71120.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71120/b71120.csproj
index b6f8062..30924b0 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71120/b71120.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71120/b71120.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71135/b71135.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71135/b71135.csproj
index cb7e9db..a53d0fe 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71135/b71135.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71135/b71135.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71155/b71155.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71155/b71155.csproj
index c915f1f..8f90268 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71155/b71155.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71155/b71155.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71231/b71231.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71231/b71231.csproj
index 4122851..c163d15 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71231/b71231.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b71231/b71231.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72136/b72136.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72136/b72136.csproj
index ba795ba..df148da 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72136/b72136.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72136/b72136.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72164/b72164.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72164/b72164.csproj
index c87dfea..ce0144d 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72164/b72164.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72164/b72164.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72422/b72422.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72422/b72422.csproj
index aa43788..19729f4 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72422/b72422.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72422/b72422.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72687/b72687.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72687/b72687.csproj
index cc59e17..1612961 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72687/b72687.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72687/b72687.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72932/b72932.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72932/b72932.csproj
index a5a53dc..dff892a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72932/b72932.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72932/b72932.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72986/b72986.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72986/b72986.csproj
index 9d80ff8..37bba45 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72986/b72986.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72986/b72986.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72996/b72996.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72996/b72996.csproj
index e7cce68..556de8c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72996/b72996.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b72996/b72996.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73921/b73921.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73921/b73921.csproj
index 4690f0c..2c94ec4 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73921/b73921.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b73921/b73921.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74182/b74182.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74182/b74182.csproj
index 3f6fb17..581a781 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74182/b74182.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b74182/b74182.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75250/b75250.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75250/b75250.csproj
index 6e64a2f..04d01a1 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75250/b75250.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75250/b75250.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75509/b75509.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75509/b75509.csproj
index 76f5378..dcf1916 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75509/b75509.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75509/b75509.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75988/b75988.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75988/b75988.ilproj
index aab2750..34bf12b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75988/b75988.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b75988/b75988.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76267/b76267.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76267/b76267.csproj
index bb1f580..ac10034 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76267/b76267.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76267/b76267.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76511/b76511.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76511/b76511.csproj
index 9cc0bef..b276744 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76511/b76511.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76511/b76511.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76590/b76590.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76590/b76590.csproj
index 93d48b1..3b9b0fb 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76590/b76590.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76590/b76590.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76717/b76717.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76717/b76717.csproj
index 32cd603..5446ffa 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76717/b76717.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b76717/b76717.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77707/b77707.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77707/b77707.csproj
index d5296c5..52b50a7 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77707/b77707.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77707/b77707.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77713/b77713.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77713/b77713.csproj
index 44c7df3..b0512dc 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77713/b77713.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b77713/b77713.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78392/b78392.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78392/b78392.csproj
index 6040e13..e51f6d8 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78392/b78392.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78392/b78392.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78694/b78694.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78694/b78694.csproj
index be001e3..cf7a4f8 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78694/b78694.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b78694/b78694.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79418/b79418.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79418/b79418.csproj
index 5bfc486..6cd41ec 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79418/b79418.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79418/b79418.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79642/b79642.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79642/b79642.csproj
index 57fdd42..687885f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79642/b79642.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b79642/b79642.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80045/b80045.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80045/b80045.csproj
index 3394120..4b6a770 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80045/b80045.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80045/b80045.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80764/b80764.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80764/b80764.csproj
index 947b1e3..749670f5 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80764/b80764.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b80764/b80764.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81618/b81618.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81618/b81618.csproj
index 19b6754..e8dc0d5 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81618/b81618.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b81618/b81618.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82048/b82048.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82048/b82048.csproj
index 039d719..bd53ec3 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82048/b82048.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82048/b82048.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82866/b82866.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82866/b82866.csproj
index 80c7918..19b684e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82866/b82866.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b82866/b82866.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83690/b83690.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83690/b83690.csproj
index a16c77c..9c39b0c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83690/b83690.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83690/b83690.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83702/b83702.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83702/b83702.csproj
index 929cd9b..3e01444 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83702/b83702.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b83702/b83702.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84836/b84836.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84836/b84836.csproj
index 0b7d491..10f77e6 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84836/b84836.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b84836/b84836.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b91377/b91377.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b91377/b91377.csproj
index 3f51fce..a0d3859 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b91377/b91377.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M12-Beta2/b91377/b91377.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b113239/b113239.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b113239/b113239.csproj
index bfa9096..2e52845 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b113239/b113239.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b113239/b113239.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87284/b87284.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87284/b87284.csproj
index e6637fb..a400a8b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87284/b87284.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87284/b87284.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87285/b87285.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87285/b87285.csproj
index 938bc14..25d7bc6 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87285/b87285.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b87285/b87285.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88712/b88712.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88712/b88712.csproj
index c1631a4..c1f02c8 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88712/b88712.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88712/b88712.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj
index a78e36e..75e9b56 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88793/b88793.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88797/b88797.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88797/b88797.csproj
index e48423d..b379e3f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88797/b88797.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b88797/b88797.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89277/b89277.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89277/b89277.csproj
index 0147586..4909253 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89277/b89277.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89277/b89277.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89279/b89279.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89279/b89279.csproj
index d5eefaa..8bb7e86 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89279/b89279.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89279/b89279.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89506/b89506.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89506/b89506.csproj
index 8bd3501..2ca96c3 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89506/b89506.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89506/b89506.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89600/b89600.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89600/b89600.csproj
index 32e788b..5e71fa0 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89600/b89600.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89600/b89600.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89797/b89797.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89797/b89797.csproj
index dc72268..57b78a6 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89797/b89797.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89797/b89797.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89946/b89946.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89946/b89946.csproj
index 43ce284..35eb856 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89946/b89946.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b89946/b89946.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91189/b91189.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91189/b91189.csproj
index d5ad46d..7f1c261 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91189/b91189.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91189/b91189.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91230/b91230.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91230/b91230.csproj
index ae550b6..4ce2989 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91230/b91230.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91230/b91230.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj
index 97898e3..4413135 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91248/b91248.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91855/b91855.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91855/b91855.csproj
index a92c37d..508ac5b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91855/b91855.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91855/b91855.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91859/b91859.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91859/b91859.csproj
index 6db1126..7b2a107 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91859/b91859.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91859/b91859.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91867/b91867.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91867/b91867.csproj
index 52eb88c..75c7bf8 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91867/b91867.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91867/b91867.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91917/b91917.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91917/b91917.csproj
index 0dbfdb6..d703487 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91917/b91917.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b91917/b91917.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92066/b92066.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92066/b92066.ilproj
index 0946a7f..638c6d0 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92066/b92066.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92066/b92066.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92073/b92073.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92073/b92073.ilproj
index 6194248..32d97d7 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92073/b92073.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92073/b92073.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92289/b92289.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92289/b92289.ilproj
index c3a7329..6faa0ed 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92289/b92289.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92289/b92289.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92568/b92568.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92568/b92568.csproj
index 7bbc81e..98c55f0 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92568/b92568.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92568/b92568.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92614/b92614.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92614/b92614.csproj
index fd43d3f..83e9e8d 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92614/b92614.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92614/b92614.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92693/b92693.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92693/b92693.csproj
index 0c5f96d..ff4bf2c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92693/b92693.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92693/b92693.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92714/b92714.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92714/b92714.csproj
index f0f441a..06cf46f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92714/b92714.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b92714/b92714.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93027/b93027.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93027/b93027.csproj
index ec5b918..6b967a8 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93027/b93027.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93027/b93027.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93635/b93635.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93635/b93635.ilproj
index e251748..4324665 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93635/b93635.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b93635/b93635.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b98958/b98958.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b98958/b98958.ilproj
index 83fec05..ba207ec 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b98958/b98958.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b98958/b98958.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99222/b99222.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99222/b99222.csproj
index 9701716..55646c3 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99222/b99222.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99222/b99222.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99235/b99235.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99235/b99235.csproj
index c5ec897..f6fe641 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99235/b99235.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99235/b99235.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99969/b99969.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99969/b99969.csproj
index 96899e8..2fb97e6 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99969/b99969.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M13-RTM/b99969/b99969.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538a.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538a.csproj
index 8c51221..6d90039 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538a.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538a.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538b.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538b.csproj
index f3cd880..0509d28 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538b.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-M14-SP1/b119538/b119538b.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b148815/b148815.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b148815/b148815.csproj
index eb0bd82..426b03d 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b148815/b148815.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b148815/b148815.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.ilproj
index 82fa4a5..e4850a7 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-none.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-ref.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-ref.ilproj
index 0548da1..f589e40 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-ref.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1-QFE/b151440/static-ref.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b119294/b119294.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b119294/b119294.csproj
index fe82234..7f26e62 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b119294/b119294.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b119294/b119294.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b130333/b130333.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b130333/b130333.csproj
index f2ef0c8..0da16a1 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b130333/b130333.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b130333/b130333.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140711/b140711.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140711/b140711.csproj
index 879bed6..3e078e1 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140711/b140711.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140711/b140711.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140902/b140902.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140902/b140902.csproj
index 2ab7eb9..d065461 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140902/b140902.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b140902/b140902.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.ilproj
index 92a2ee7..5b34d40 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.1-M1-Beta1/b143840/b143840.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102637/b102637.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102637/b102637.ilproj
index 6bb0b2d..64737bc 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102637/b102637.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102637/b102637.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102879/b102879.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102879/b102879.csproj
index 3600196..a9d02c58 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102879/b102879.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b102879/b102879.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b103058/b103058.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b103058/b103058.csproj
index 51c2c45..c030b19 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b103058/b103058.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b103058/b103058.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -42,10 +42,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b124232/b124232.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b124232/b124232.csproj
index c5559d7..09eaa30 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b124232/b124232.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b124232/b124232.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b169333/b169333.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b169333/b169333.csproj
index 94ba2e1..cb25d9c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b169333/b169333.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b169333/b169333.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178119/b178119.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178119/b178119.csproj
index b72bf34..81e77e2 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178119/b178119.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178119/b178119.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178128/b178128.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178128/b178128.csproj
index 3659dd8..e03392c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178128/b178128.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b178128/b178128.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381a.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381a.csproj
index 7655928..637088f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381a.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b180381/b180381a.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b191926/b191926.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b191926/b191926.csproj
index c02f446..68ef75c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b191926/b191926.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b191926/b191926.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharpgenerictypes.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharpgenerictypes.csproj
index 9153c93..a476eaa 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharpgenerictypes.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharpgenerictypes.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharptester.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharptester.csproj
index c6acbd0..89527ed 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharptester.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b210352/csharptester.csproj
@@ -38,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/b213516.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/b213516.ilproj
index 13244a3..1d6095c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/b213516.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/b213516.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/lib-219037.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/lib-219037.ilproj
index a18e9b0..4eca97a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/lib-219037.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b213516/lib-219037.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <CLRTestKind>BuildOnly</CLRTestKind>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b219940/b219940.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b219940/b219940.csproj
index 4bb9057..92fd6a6 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b219940/b219940.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-Beta1/b219940/b219940.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00735/b00735.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00735/b00735.csproj
index f73b9a3..65648f2 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00735/b00735.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b00735/b00735.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02345/b02345.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02345/b02345.csproj
index 0491644..2d47af1 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02345/b02345.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02345/b02345.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02762/b02762.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02762/b02762.csproj
index 84a7f0c..f5ed136 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02762/b02762.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b02762/b02762.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b03689/b03689.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b03689/b03689.ilproj
index 8e7afdf..b0adbef 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b03689/b03689.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b03689/b03689.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07211/b07211.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07211/b07211.csproj
index f2ef0c8..0da16a1 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07211/b07211.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07211/b07211.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07900/b07900.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07900/b07900.csproj
index 2ac4056..7e7563a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07900/b07900.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b07900/b07900.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08020/b08020.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08020/b08020.csproj
index e6616ac..5d42a6a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08020/b08020.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08020/b08020.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/b08046.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/b08046.ilproj
index a79dc43..06b780d 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/b08046.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b08046/b08046.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b11762/b11762.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b11762/b11762.csproj
index bc69309..502706f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b11762/b11762.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b11762/b11762.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16378/b16378.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16378/b16378.ilproj
index 1777dab..a36eac3 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16378/b16378.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16378/b16378.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16382/b16382.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16382/b16382.ilproj
index 54e58ee..6d9bcde 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16382/b16382.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16382/b16382.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16386/b16386.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16386/b16386.csproj
index f3d4a24..49a1515 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16386/b16386.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16386/b16386.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16399/b16399.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16399/b16399.csproj
index ed5ede3..1326604 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16399/b16399.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16399/b16399.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16473/b16473.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16473/b16473.ilproj
index 727a140..f8cd63c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16473/b16473.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16473/b16473.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16570/b16570.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16570/b16570.csproj
index 9511ad0..79eb801 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16570/b16570.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M01/b16570/b16570.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b00719/b00719.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b00719/b00719.csproj
index 0f9ae2c..5878eb0 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b00719/b00719.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b00719/b00719.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <IlasmRoundTrip>true</IlasmRoundTrip>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b19171/b19171.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b19171/b19171.csproj
index a2a2497..851c9a7 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b19171/b19171.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b19171/b19171.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b21296/b21296.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b21296/b21296.csproj
index cced4a3..3c1827c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b21296/b21296.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b21296/b21296.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b30251/b30251.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b30251/b30251.csproj
index 0a0cc41..cf50735 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b30251/b30251.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b30251/b30251.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b31398/b31398.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b31398/b31398.csproj
index aa1d652..05dbfdb 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b31398/b31398.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V1.2-M02/b31398/b31398.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b102533/b102533.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b102533/b102533.csproj
index af02f1a..e5ea1bd 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b102533/b102533.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b102533/b102533.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b125091/b125091.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b125091/b125091.ilproj
index b6ada98..e25467a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b125091/b125091.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b125091/b125091.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b268908/b268908.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b268908/b268908.csproj
index fdaba30..07136e1 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b268908/b268908.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b268908/b268908.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b320147/b320147.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b320147/b320147.csproj
index 8386a1a..a476f3f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b320147/b320147.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b320147/b320147.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b321799/b321799.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b321799/b321799.csproj
index ba51d2a..8709571 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b321799/b321799.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b321799/b321799.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b338014/b338014.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b338014/b338014.csproj
index 418226e..930a730 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b338014/b338014.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b338014/b338014.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b359564/b359564.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b359564/b359564.ilproj
index 5174a06..c731c52 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b359564/b359564.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b359564/b359564.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.csproj
index b606bbf..2c3549e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444a.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.csproj
index 2a18a58..ac412bc 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b399444/b399444b.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b405223/b405223.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b405223/b405223.csproj
index af70703..37e6528 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b405223/b405223.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b405223/b405223.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b416667/b416667.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b416667/b416667.csproj
index 5c7f89f..6dec2fa 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b416667/b416667.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b416667/b416667.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/b423721.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/b423721.csproj
index 5525acb..d44a573 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/b423721.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/b423721.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="c1.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/c1.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/c1.csproj
index dbb5410..8cee4ec 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/c1.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423721/c1.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/b423755.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/b423755.ilproj
index 0d2ab98..2e9f1a3 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/b423755.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b423755/b423755.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.ilproj
index e640a22..3971205 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b426654/b426654.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b441487/b441487.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b441487/b441487.ilproj
index b77c00f..7e7ad8a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b441487/b441487.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b441487/b441487.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b448208/Desktop/b448208.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b448208/Desktop/b448208.csproj
index 156c306..20f3abf 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b448208/Desktop/b448208.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b448208/Desktop/b448208.csproj
@@ -33,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b449827/b449827.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b449827/b449827.csproj
index 35b8623..e21753b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b449827/b449827.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-Beta2/b449827/b449827.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b369916/b369916.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b369916/b369916.csproj
index 0138d03..25fafbe 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b369916/b369916.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b369916/b369916.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487364/b487364.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487364/b487364.ilproj
index fdb91cd..3c6ebce 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487364/b487364.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487364/b487364.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487372/b487372.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487372/b487372.ilproj
index 6725797..c2b4345 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487372/b487372.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b487372/b487372.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b491215/b491215.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b491215/b491215.csproj
index 53eea83..80ce12d 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b491215/b491215.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b491215/b491215.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b530694/b530694.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b530694/b530694.ilproj
index 92da94a..45f19a7 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b530694/b530694.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b530694/b530694.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b604247/b604247.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b604247/b604247.csproj
index 1b09c33..5857ea3 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b604247/b604247.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/V2.0-RTM/b604247/b604247.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b392262/b392262.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b392262/b392262.csproj
index e68b64f..f25c45b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b392262/b392262.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b392262/b392262.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b393481/b393481.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b393481/b393481.csproj
index 30c26e8..68daaac 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b393481/b393481.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b393481/b393481.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b400791/_b400971b400971.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b400791/_b400971b400971.csproj
index 65964eb..6bf5f89 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b400791/_b400971b400971.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b400791/_b400971b400971.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402658/b402658.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402658/b402658.csproj
index 103c74d..718bd1e 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402658/b402658.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402658/b402658.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402701/b402701.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402701/b402701.csproj
index 1fb4053..23f5ff5 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402701/b402701.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b402701/b402701.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b404051/b404051.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b404051/b404051.ilproj
index 7ac7e52..ca05c98 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b404051/b404051.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b404051/b404051.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b440158/b440158.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b440158/b440158.ilproj
index 7f39a4e..9661aec 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b440158/b440158.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev10/b440158/b440158.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev11/DevDiv_376412/DevDiv_376412.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev11/DevDiv_376412/DevDiv_376412.csproj
index b586abe..b0a3bcb 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev11/DevDiv_376412/DevDiv_376412.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/dev11/DevDiv_376412/DevDiv_376412.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v1-m08/b12668/b12668.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v1-m08/b12668/b12668.csproj
index 83c3b70..158f695 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v1-m08/b12668/b12668.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v1-m08/b12668/b12668.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b121938/ConstToString.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b121938/ConstToString.csproj
index 87dc043..85fb9b5 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b121938/ConstToString.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b121938/ConstToString.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b151497/b151497.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b151497/b151497.csproj
index 1746ba8..0b98776 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b151497/b151497.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b151497/b151497.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b158861/b158861.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b158861/b158861.csproj
index 67f2599..7f33c1b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b158861/b158861.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b158861/b158861.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b163200/b163200.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b163200/b163200.csproj
index aead2c4..a506fea 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b163200/b163200.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b163200/b163200.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.csproj
index c1abcf8..1e1c1a5 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b170362/b170362.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b175679/b175679.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b175679/b175679.ilproj
index 6ded226..47224cd 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b175679/b175679.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b175679/b175679.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b188478/b188478.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b188478/b188478.csproj
index fbe7d85..97d8198 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b188478/b188478.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b188478/b188478.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b19679/b19679.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b19679/b19679.csproj
index a3f6391..fa161c9 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b19679/b19679.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b19679/b19679.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b202743/b202743.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b202743/b202743.csproj
index b3c2d37..ffce65b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b202743/b202743.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b202743/b202743.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b33183/b33183.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b33183/b33183.csproj
index b3a3972..3df852c 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b33183/b33183.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b33183/b33183.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b49778/b49778.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b49778/b49778.csproj
index f7b65c5..2d6b66b 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b49778/b49778.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/DDB/b49778/b49778.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b106272/b106272.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b106272/b106272.csproj
index 8015254..739f2b8 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b106272/b106272.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b106272/b106272.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b152292/b152292.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b152292/b152292.csproj
index 06dc89b..5aed678 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b152292/b152292.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b152292/b152292.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b561129/b561129.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b561129/b561129.csproj
index 2625861..8d82393 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b561129/b561129.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b561129/b561129.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b565808/b565808.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b565808/b565808.csproj
index 83ad52d..22a776a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b565808/b565808.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b565808/b565808.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b569942/b569942.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b569942/b569942.csproj
index 64f6f52..988d3e3 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b569942/b569942.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b569942/b569942.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b589202/b589202.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b589202/b589202.csproj
index ca71adb..dbc6032 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b589202/b589202.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b589202/b589202.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598034/b598034.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598034/b598034.csproj
index 4fcedaf..d5d9d16 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598034/b598034.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598034/b598034.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598649/b598649.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598649/b598649.csproj
index 3a3f09a..33615c2 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598649/b598649.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b598649/b598649.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b602004/b602004.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b602004/b602004.csproj
index d62c300..04bd533 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b602004/b602004.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b602004/b602004.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608066/b608066.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608066/b608066.csproj
index 9e95a7e..3dbf50a 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608066/b608066.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608066/b608066.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608198/b608198.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608198/b608198.csproj
index 2216309..740dbf7 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608198/b608198.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b608198/b608198.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609280/b609280.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609280/b609280.csproj
index 023a000..36666e4 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609280/b609280.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609280/b609280.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/Desktop/b609988.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/Desktop/b609988.ilproj
index 9f8d473..22f06eb 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/Desktop/b609988.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/Desktop/b609988.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/b609988.ilproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/b609988.ilproj
index ca85822..ccb7e02 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/b609988.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b609988/b609988.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610562/b610562.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610562/b610562.csproj
index 2aabfe9..68c867f 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610562/b610562.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610562/b610562.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750.csproj
index 49198ec..e4b6980 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750_32vs64.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750_32vs64.csproj
index 49ddebe..50330a1 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750_32vs64.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b610750/b610750_32vs64.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b611219/b611219.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b611219/b611219.csproj
index d86159b..38f4fcf 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b611219/b611219.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b611219/b611219.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b72218/b72218.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b72218/b72218.csproj
index 6713404..bbf2f5a95 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b72218/b72218.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.1/b72218/b72218.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/ddb188478/DDB188478.csproj b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/ddb188478/DDB188478.csproj
index ef9e4f8..2654384 100644
--- a/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/ddb188478/DDB188478.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/CLR-x86-JIT/v2.2/ddb/ddb188478/DDB188478.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj
index a531a42..dd08428 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj
index c16a02c..dc4af45 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj
index f51097a..d3f0979 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj
index 7b7e014..4f52c3c 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj
index 0059375..1e31649 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj
index 8d1d238..7f7d5b2 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/Dev11/External/Dev11_243742/app.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/Dev11_243742/app.csproj
index e67d646..318a1eb 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/Dev11_243742/app.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/Dev11_243742/app.csproj
@@ -36,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>
   <ItemGroup>
     <ProjectReference Include="dll.csproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/Dev11/External/Dev11_243742/dll.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/Dev11_243742/dll.csproj
index c066a94..bdbec14 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/Dev11_243742/dll.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/Dev11_243742/dll.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_111914/BadMax1.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_111914/BadMax1.csproj
index 7b6bb0b..88c5817 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_111914/BadMax1.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_111914/BadMax1.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_131317/BadBox1.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_131317/BadBox1.csproj
index 2a9f2a6..f5cfeae 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_131317/BadBox1.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_131317/BadBox1.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_132534/CSharpPart.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_132534/CSharpPart.csproj
index 5d25520..47a7fb5 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_132534/CSharpPart.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_132534/CSharpPart.csproj
@@ -40,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/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_135245/R3Trasher1.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_135245/R3Trasher1.csproj
index 06216dc..82b963a 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_135245/R3Trasher1.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_135245/R3Trasher1.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.ilproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.ilproj
index bca9494..fc143e2 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_13748/ReflectOnField.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_145295/CSharpPart.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_145295/CSharpPart.csproj
index 5120d31..8478084 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_145295/CSharpPart.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_145295/CSharpPart.csproj
@@ -41,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/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_154899/DynamicStaticAlignment.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_154899/DynamicStaticAlignment.csproj
index 3b8090f..d3db6a6 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_154899/DynamicStaticAlignment.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_154899/DynamicStaticAlignment.csproj
@@ -34,10 +34,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/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_239804/ShowLocallocAlignment.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_239804/ShowLocallocAlignment.csproj
index 021afcf..234e248 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_239804/ShowLocallocAlignment.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_239804/ShowLocallocAlignment.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_27971/UninitializedHighWord.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_27971/UninitializedHighWord.csproj
index bb1d3bd..595c883 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_27971/UninitializedHighWord.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_27971/UninitializedHighWord.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_28763/R3Contention.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_28763/R3Contention.csproj
index 13e845d..b2c4927 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_28763/R3Contention.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_28763/R3Contention.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_77709/BadCheckedAdd1.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_77709/BadCheckedAdd1.csproj
index 5bb8492..884159b 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_77709/BadCheckedAdd1.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_77709/BadCheckedAdd1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_91048/UseTrashedVfp1.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_91048/UseTrashedVfp1.csproj
index 888f1fb..6b040a7 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_91048/UseTrashedVfp1.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/External/dev11_91048/UseTrashedVfp1.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/Dev11/dev10_865840/dev10_865840.ilproj b/src/coreclr/tests/src/JIT/Regression/Dev11/dev10_865840/dev10_865840.ilproj
index c20fab2..03db285 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/dev10_865840/dev10_865840.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/dev10_865840/dev10_865840.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj
index ee58675..46cf82d 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_10427/conv_ovf_i4.ilproj b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_10427/conv_ovf_i4.ilproj
index 8813c65..8ed5f2d 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_10427/conv_ovf_i4.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_10427/conv_ovf_i4.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj
index 35b5d17..76008d7 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj
index 55deee5..c6b507f 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_d.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_d.csproj
index 42ff39a..32a94a6 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_d.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_do.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_do.csproj
index 31713b1..4c3e083 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_do.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_r.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_r.csproj
index 6244527..df6327e 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_r.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_ro.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_ro.csproj
index 7ebe84c..2870a50 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_20929/dev11_20929_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_4421/Dev11_4421.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_4421/Dev11_4421.csproj
index 3d1e3e0..0604907 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_4421/Dev11_4421.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_4421/Dev11_4421.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_76013/Dev11_76013.csproj b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_76013/Dev11_76013.csproj
index 95902c7..35a1aa7 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_76013/Dev11_76013.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev11/dev11_76013/Dev11_76013.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj b/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj
index 7624696..58abb5d 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj b/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj
index f3b5147..68bd387 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj b/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj
index 91a9f8a..efbd92a 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj b/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj
index 2c818a5..725d029 100644
--- a/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/Dev14/DevDiv_876169/DevDiv_876169_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_1206929/DevDiv_1206929.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_1206929/DevDiv_1206929.csproj
index a1f7eaa..d6ef74f 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_1206929/DevDiv_1206929.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_1206929/DevDiv_1206929.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_142976/DevDiv_142976.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_142976/DevDiv_142976.csproj
index 0c1a10e..f219801 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_142976/DevDiv_142976.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_142976/DevDiv_142976.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_150265/DevDiv_150265.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_150265/DevDiv_150265.csproj
index 648f9fe..0b91063 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_150265/DevDiv_150265.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_150265/DevDiv_150265.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_150586/DevDiv_150586.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_150586/DevDiv_150586.ilproj
index f5a266c..a52f8f3 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_150586/DevDiv_150586.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_150586/DevDiv_150586.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_168744/DevDiv_168744.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_168744/DevDiv_168744.csproj
index b174dea..6b8b07a 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_168744/DevDiv_168744.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_168744/DevDiv_168744.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_200492/DevDiv_200492.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_200492/DevDiv_200492.csproj
index 880e18f..63118ed 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_200492/DevDiv_200492.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_200492/DevDiv_200492.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_205323/starg0.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_205323/starg0.ilproj
index 900ef40..a46e463 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_205323/starg0.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_205323/starg0.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_206786/handleMath.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_206786/handleMath.ilproj
index ed5e492..984d6b1 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_206786/handleMath.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_206786/handleMath.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_255294/DevDiv_255294.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_255294/DevDiv_255294.csproj
index 9027bb5..18a33fd 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_255294/DevDiv_255294.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_255294/DevDiv_255294.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278365/DevDiv_278365.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278365/DevDiv_278365.csproj
index 0abcfd8..32c60c2 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278365/DevDiv_278365.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278365/DevDiv_278365.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278369/DevDiv_278369.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278369/DevDiv_278369.ilproj
index deebeec..0023a15 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278369/DevDiv_278369.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278369/DevDiv_278369.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278375/DevDiv_278375.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278375/DevDiv_278375.csproj
index 9477984..43e5489 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278375/DevDiv_278375.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278375/DevDiv_278375.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278376/DevDiv_278376.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278376/DevDiv_278376.csproj
index 90327b2..6b12eec 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278376/DevDiv_278376.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278376/DevDiv_278376.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj
index d4cfe45..9104c3c 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278523/DevDiv_278523.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278526/DevDiv_278526.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278526/DevDiv_278526.csproj
index b1bd003..27b8ecee 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278526/DevDiv_278526.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_278526/DevDiv_278526.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_279396/DevDiv_279396.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_279396/DevDiv_279396.ilproj
index 2a9f58b..ff2c259 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_279396/DevDiv_279396.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_279396/DevDiv_279396.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_279829/DevDiv_279829.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_279829/DevDiv_279829.ilproj
index d4804c8..284d6ea 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_279829/DevDiv_279829.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_279829/DevDiv_279829.ilproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_280120/DevDiv_280120.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_280120/DevDiv_280120.csproj
index bcbdc0f..ed4c0ad 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_280120/DevDiv_280120.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_280120/DevDiv_280120.csproj
@@ -46,10 +46,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_280123/DevDiv_280123.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_280123/DevDiv_280123.csproj
index a2ec975..b097a58 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_280123/DevDiv_280123.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_280123/DevDiv_280123.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_280127/DevDiv_280127.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_280127/DevDiv_280127.csproj
index ec9776d..82919ac 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_280127/DevDiv_280127.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_280127/DevDiv_280127.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_283795/DevDiv_283795.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_283795/DevDiv_283795.csproj
index 71bd55f..4a2480f 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_283795/DevDiv_283795.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_283795/DevDiv_283795.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_284785/DevDiv_284785.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_284785/DevDiv_284785.csproj
index d27b911..8b7d26c 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_284785/DevDiv_284785.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_284785/DevDiv_284785.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_288222/DevDiv_288222.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_288222/DevDiv_288222.csproj
index 0aa2d11..e77962a 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_288222/DevDiv_288222.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_288222/DevDiv_288222.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359733/DevDiv_359733.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359733/DevDiv_359733.ilproj
index 8f0870d..759eb21 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359733/DevDiv_359733.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359733/DevDiv_359733.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359734/DevDiv_359734.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359734/DevDiv_359734.ilproj
index b13550f..d81d9df 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359734/DevDiv_359734.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359734/DevDiv_359734.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_d.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_d.csproj
index 93bc9fd..6becb94 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_d.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_do.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_do.csproj
index 07c2edf..7d258a4 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_do.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_r.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_r.csproj
index fcc7a16..2c9dd64 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_r.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_ro.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_ro.csproj
index c8a1bef..c2b1c39 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359736/DevDiv_359736_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359737/DevDiv_359737.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359737/DevDiv_359737.ilproj
index f05d981..e666f5f 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359737/DevDiv_359737.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_359737/DevDiv_359737.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_d.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_d.csproj
index ed34015..8380f3c 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_d.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_do.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_do.csproj
index 34995dd..61b0a70 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_do.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_r.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_r.csproj
index 0501f30..71dfd96 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_r.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_ro.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_ro.csproj
index 838271a..4baccf7 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794115/DevDiv_794115_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_d.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_d.csproj
index ca07155..4bbe713 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_d.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_do.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_do.csproj
index f289d64..417c4ff 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_do.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_r.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_r.csproj
index 754c44a..0f46e19 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_r.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_ro.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_ro.csproj
index 514a205..d71a149 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_794631/DevDiv_794631_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_d.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_d.csproj
index b5d1ff5..4bc7866 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_d.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_do.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_do.csproj
index 2f5bd65..aca148d 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_do.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_r.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_r.csproj
index 30642c4..8775b46 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_r.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_ro.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_ro.csproj
index 8884833..bd6f924 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_815940/DevDiv_815940_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_d.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_d.csproj
index a946e61..9d8889e 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_d.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_do.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_do.csproj
index 03fc236..0ce8faf 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_do.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_r.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_r.csproj
index ae677c9..6905fe7 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_r.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_ro.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_ro.csproj
index 2980358..3622bfb 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/DevDiv_816617/DevDiv_816617_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_1296/GitHub_1296.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_1296/GitHub_1296.csproj
index b174dea..6b8b07a 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_1296/GitHub_1296.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_1296/GitHub_1296.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_1323/GitHub_1323.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_1323/GitHub_1323.csproj
index 761bcc5..9edb026 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_1323/GitHub_1323.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_1323/GitHub_1323.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_2580/GitHub_2580.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_2580/GitHub_2580.csproj
index b174dea..6b8b07a 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_2580/GitHub_2580.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_2580/GitHub_2580.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_2610/GitHub_2610.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_2610/GitHub_2610.csproj
index b174dea..6b8b07a 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_2610/GitHub_2610.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_2610/GitHub_2610.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_3449/GitHub_3449.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_3449/GitHub_3449.csproj
index b174dea..6b8b07a 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_3449/GitHub_3449.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_3449/GitHub_3449.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.csproj
index 4b9887d..84fd029 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_4044/GitHub_4044.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_5047/GitHub_5047.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_5047/GitHub_5047.csproj
index 034a4c0..32bc402 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_5047/GitHub_5047.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_5047/GitHub_5047.csproj
@@ -26,10 +26,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_5164/GitHub_5164.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_5164/GitHub_5164.ilproj
index 1d245ad..d9be192 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_5164/GitHub_5164.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_5164/GitHub_5164.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_6318/GitHub_6318.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_6318/GitHub_6318.csproj
index a22fd04..8d2b492 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_6318/GitHub_6318.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_6318/GitHub_6318.csproj
@@ -28,10 +28,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_6649/GitHub_6649.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_6649/GitHub_6649.csproj
index 6714568..6035df3 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_6649/GitHub_6649.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_6649/GitHub_6649.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_7508/Vector3Test.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_7508/Vector3Test.csproj
index 2e97f36..6b8b07a 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_7508/Vector3Test.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_7508/Vector3Test.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_7907/GitHub_7907.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_7907/GitHub_7907.csproj
index 5c86d0f..3c4a14e 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_7907/GitHub_7907.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_7907/GitHub_7907.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8133/GitHub_8133.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8133/GitHub_8133.ilproj
index 3d8d22e..ad6e69a 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8133/GitHub_8133.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8133/GitHub_8133.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8170/GitHub_8170.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8170/GitHub_8170.csproj
index 81aa729..8bb1ce2 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8170/GitHub_8170.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8170/GitHub_8170.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8460/GitHub_8460.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8460/GitHub_8460.csproj
index b174dea..6b8b07a 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8460/GitHub_8460.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8460/GitHub_8460.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8599/GitHub_8599.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8599/GitHub_8599.csproj
index b174dea..6b8b07a 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8599/GitHub_8599.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_8599/GitHub_8599.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_9651/GitHub_9651.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_9651/GitHub_9651.ilproj
index 0a2003a..20fbde3 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_9651/GitHub_9651.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_9651/GitHub_9651.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_CoreRT_2073/GitHub_CoreRT_2073.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_CoreRT_2073/GitHub_CoreRT_2073.ilproj
index fe8a3d3..18d0164 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_CoreRT_2073/GitHub_CoreRT_2073.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/GitHub_CoreRT_2073/GitHub_CoreRT_2073.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_174983/devdiv_174983.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_174983/devdiv_174983.csproj
index 3a0797e..4a7a31f 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_174983/devdiv_174983.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_174983/devdiv_174983.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_815941/devdiv_815941.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_815941/devdiv_815941.ilproj
index 740c556..ac6a6ee 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_815941/devdiv_815941.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_815941/devdiv_815941.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_815942/devdiv_815942.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_815942/devdiv_815942.ilproj
index c020f4d..ada8039 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_815942/devdiv_815942.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_815942/devdiv_815942.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271.ilproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271.ilproj
index 26f0d9f..7f23420 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_902271/DevDiv_902271.ilproj
@@ -37,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_d.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_d.csproj
index 21a9d89..9055624 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_d.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_do.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_do.csproj
index 85b1ade..8343c29 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_do.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_r.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_r.csproj
index 5911ead..8956ce7 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_r.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_ro.csproj b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_ro.csproj
index e19791d..7631588 100644
--- a/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_ro.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/JitBlue/devdiv_911875/DevDiv_911875_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b100336/b100336.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b100336/b100336.csproj
index 0856627..4f5661e 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b100336/b100336.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b100336/b100336.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103846/b103846.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103846/b103846.csproj
index dc816eb..f756f55 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103846/b103846.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b103846/b103846.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111130/b111130.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111130/b111130.csproj
index ccb98a4..b59e73c 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111130/b111130.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111130/b111130.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111192/b111192.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111192/b111192.csproj
index 6536746..8df22f4 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111192/b111192.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b111192/b111192.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112348/b112348.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112348/b112348.ilproj
index 3ee6dbd..8a2ff10 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112348/b112348.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b112348/b112348.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113493/b113493.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113493/b113493.csproj
index 09d312b..b91f310 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113493/b113493.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b113493/b113493.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115253/b115253.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115253/b115253.csproj
index 0d80c4c..9805b14 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115253/b115253.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b115253/b115253.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026a.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026a.csproj
index 868143a..556dd21 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026a.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026a.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026b.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026b.csproj
index efb33d9..7b8d12a 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026b.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b119026/b119026b.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b140298/b140298.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b140298/b140298.csproj
index 8012759..63c98ea 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b140298/b140298.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b140298/b140298.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141358/b141358.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141358/b141358.csproj
index 1812a36..bff09db 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141358/b141358.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b141358/b141358.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b77951/b77951.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b77951/b77951.csproj
index a596be9..208cd42 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b77951/b77951.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b77951/b77951.csproj
@@ -36,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84128/b84128.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84128/b84128.ilproj
index 217b2b4..4c67997 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84128/b84128.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b84128/b84128.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b98431/b98431.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b98431/b98431.ilproj
index 1f6dce8..10b1db4 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b98431/b98431.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b98431/b98431.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99219/b99219.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99219/b99219.csproj
index effd0df..a17d518 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99219/b99219.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99219/b99219.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99403/b99403.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99403/b99403.ilproj
index fb84304..4b5447f 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99403/b99403.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/M00/b99403/b99403.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102615/b102615.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102615/b102615.csproj
index 3189909..e0ac070 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102615/b102615.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102615/b102615.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102860/b102860.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102860/b102860.csproj
index 07bf6ad..02c96f5 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102860/b102860.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102860/b102860.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102887/b102887.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102887/b102887.csproj
index bb8b77b..91155f4 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102887/b102887.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b102887/b102887.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b124409/b124409.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b124409/b124409.csproj
index 7ec4ea7..caa4892 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b124409/b124409.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b124409/b124409.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b126221/b126221.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b126221/b126221.ilproj
index 7eea630..bc81d97 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b126221/b126221.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b126221/b126221.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b142473/b142473.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b142473/b142473.ilproj
index 5d71e96..bcfe2ee 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b142473/b142473.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b142473/b142473.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj
index 04b5209..2bcca2a 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b302509/b302509.csproj
@@ -39,10 +39,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91074/b91074.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91074/b91074.csproj
index 9a7716b..80ffa02 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91074/b91074.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-Beta1/b91074/b91074.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10789/b10789.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10789/b10789.csproj
index f1d4c7d..212b68a 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10789/b10789.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10789/b10789.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10790/b10790.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10790/b10790.csproj
index 7599ef5..862f698 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10790/b10790.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10790/b10790.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10827/b10827.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10827/b10827.csproj
index 770e0ab..874dbe7 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10827/b10827.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10827/b10827.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10852/b10852.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10852/b10852.ilproj
index 79e5f9e..5691fba 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10852/b10852.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b10852/b10852.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b14324/b14324.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b14324/b14324.ilproj
index 6c2b64e..de103cf 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b14324/b14324.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b14324/b14324.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112a.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112a.csproj
index bcf406c..41496e7 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112a.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112a.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112b.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112b.csproj
index 3de0aec..7d57206 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112b.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M01/b19112/b19112b.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102729/b102729.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102729/b102729.csproj
index cc7a38d..7721629 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102729/b102729.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102729/b102729.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102763/b102763.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102763/b102763.csproj
index f28ae30..ddc6cf0 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102763/b102763.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102763/b102763.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102886/b102886.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102886/b102886.csproj
index 9816703..dec08f8 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102886/b102886.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b102886/b102886.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.csproj
index e541f40..fea0f8c 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b108129/b108129.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -42,10 +42,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b10828/b10828.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b10828/b10828.csproj
index 78bcf67..a1e6b7c 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b10828/b10828.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b10828/b10828.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/b12011.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/b12011.ilproj
index 30f29de..3e7972d 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/b12011.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b12011/b12011.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14355/b14355.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14355/b14355.ilproj
index 5e14c0f..2c95f85 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14355/b14355.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14355/b14355.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14364/b14364.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14364/b14364.ilproj
index a6d3ffa..52b2403 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14364/b14364.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b14364/b14364.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <GCStressIncompatible>true</GCStressIncompatible>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b15539/b15539.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b15539/b15539.csproj
index 4f476a5..5b186f7 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b15539/b15539.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b15539/b15539.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19101/b19101.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19101/b19101.ilproj
index 0c0cbfb..8301e28 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19101/b19101.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19101/b19101.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19289/b19289.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19289/b19289.ilproj
index d778818..f2765aa 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19289/b19289.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19289/b19289.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19394/b19394.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19394/b19394.csproj
index a5105e9..de3b490 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19394/b19394.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b19394/b19394.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b21015/b21015.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b21015/b21015.csproj
index b2da014..cdbc3ac 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b21015/b21015.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b21015/b21015.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b26496/b26496.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b26496/b26496.csproj
index 205af20..ca8f3dd 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b26496/b26496.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b26496/b26496.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27077/b27077.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27077/b27077.ilproj
index d124960..1500b72 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27077/b27077.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27077/b27077.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27978/b27978.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27978/b27978.csproj
index a780884..941eee1 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27978/b27978.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27978/b27978.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27980/b27980.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27980/b27980.csproj
index 67d2082..ac867c2 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27980/b27980.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b27980/b27980.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28077/b28077.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28077/b28077.csproj
index e454185..b5cd01e 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28077/b28077.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28077/b28077.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28141/b28141.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28141/b28141.csproj
index 091b56b..bc3fda3 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28141/b28141.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b28141/b28141.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29343/b29343.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29343/b29343.csproj
index 36e59bb..e861ad8 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29343/b29343.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V1.2-M02/b29343/b29343.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b184799/b184799.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b184799/b184799.csproj
index 4e141a0..6728d79 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b184799/b184799.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b184799/b184799.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b302558/b302558.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b302558/b302558.csproj
index 9ab7125..6a3fd40 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b302558/b302558.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b302558/b302558.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309539/b309539.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309539/b309539.csproj
index 8c29db4..38a1fbd 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309539/b309539.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309539/b309539.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309548/b309548.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309548/b309548.csproj
index 1306e25..59a6698 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309548/b309548.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b309548/b309548.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj
index 77a35cd..ec7926f 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b311420/b311420.csproj
@@ -38,10 +38,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b360587/b360587.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b360587/b360587.csproj
index cada269..f8875be 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b360587/b360587.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b360587/b360587.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b410474/b410474.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b410474/b410474.ilproj
index a5cc4af..dfb14ea 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b410474/b410474.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-Beta2/b410474/b410474.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b286991/b286991.ilproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b286991/b286991.ilproj
index a76a2a9..c12bcc8 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b286991/b286991.ilproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b286991/b286991.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b539509/b539509.csproj b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b539509/b539509.csproj
index aecf8ab..57a589a 100644
--- a/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b539509/b539509.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/VS-ia64-JIT/V2.0-RTM/b539509/b539509.csproj
@@ -34,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/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b601838/b601838.csproj b/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b601838/b601838.csproj
index af0f8a8..b50fa68 100644
--- a/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b601838/b601838.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v2.1/b601838/b601838.csproj
@@ -37,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/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v4.0/DevDiv34372/overRepLocalOpt.csproj b/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v4.0/DevDiv34372/overRepLocalOpt.csproj
index cd63801..15367bd 100644
--- a/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v4.0/DevDiv34372/overRepLocalOpt.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v4.0/DevDiv34372/overRepLocalOpt.csproj
@@ -35,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/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v4.0/devdiv374539/DevDiv_374539.csproj b/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v4.0/devdiv374539/DevDiv_374539.csproj
index 3a2b788..c1624af 100644
--- a/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v4.0/devdiv374539/DevDiv_374539.csproj
+++ b/src/coreclr/tests/src/JIT/Regression/clr-x64-JIT/v4.0/devdiv374539/DevDiv_374539.csproj
@@ -38,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/src/coreclr/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj b/src/coreclr/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj
index 8c08507..41b6c16 100644
--- a/src/coreclr/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj
+++ b/src/coreclr/tests/src/JIT/RyuJIT/DoWhileBndChk.csproj
@@ -31,10 +31,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>
   <PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json b/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json
index e200b13..a64bce3 100644
--- a/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json
+++ b/src/coreclr/tests/src/JIT/config/benchmark+roslyn/project.json
@@ -33,4 +33,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json b/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json
index 2d7365b..ff76728 100644
--- a/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json
+++ b/src/coreclr/tests/src/JIT/config/benchmark+serialize/project.json
@@ -33,4 +33,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/config/benchmark/project.json b/src/coreclr/tests/src/JIT/config/benchmark/project.json
index bdc0c19..a57d57a 100644
--- a/src/coreclr/tests/src/JIT/config/benchmark/project.json
+++ b/src/coreclr/tests/src/JIT/config/benchmark/project.json
@@ -39,4 +39,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/config/extra/project.json b/src/coreclr/tests/src/JIT/config/extra/project.json
deleted file mode 100644
index 994b183..0000000
--- a/src/coreclr/tests/src/JIT/config/extra/project.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-02",
-    "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-25110-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-25110-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": {}
-  }
-}
diff --git a/src/coreclr/tests/src/JIT/config/minimal/project.json b/src/coreclr/tests/src/JIT/config/minimal/project.json
deleted file mode 100644
index edb3d8a..0000000
--- a/src/coreclr/tests/src/JIT/config/minimal/project.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-02",
-    "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": {}
-  }
-}
diff --git a/src/coreclr/tests/src/JIT/config/threading+thread/project.json b/src/coreclr/tests/src/JIT/config/threading+thread/project.json
deleted file mode 100644
index e0978df..0000000
--- a/src/coreclr/tests/src/JIT/config/threading+thread/project.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-02",
-    "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": {}
-  }
-}
diff --git a/src/coreclr/tests/src/JIT/config/threading/project.json b/src/coreclr/tests/src/JIT/config/threading/project.json
deleted file mode 100644
index c115d2c..0000000
--- a/src/coreclr/tests/src/JIT/config/threading/project.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  "dependencies": {
-    "Microsoft.NETCore.Platforms": "2.0.0-beta-25110-02",
-    "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": {}
-  }
-}
diff --git a/src/coreclr/tests/src/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj b/src/coreclr/tests/src/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj
index ec4469a..8c4ccac 100644
--- a/src/coreclr/tests/src/JIT/jit64/ebvts/cs/generics/generics/repro52.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/ebvts/cs/generics/generics/repro52.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/eh/Common/common.csproj b/src/coreclr/tests/src/JIT/jit64/eh/Common/common.csproj
index ccdd3ac..f615411 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/Common/common.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/Common/common.csproj
@@ -37,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/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.csproj b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.csproj
index 69da767..b526155 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1.csproj
@@ -36,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>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1_o.csproj b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1_o.csproj
index 2187197..152f9df 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1_o.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset1_o.csproj
@@ -36,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>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.csproj b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.csproj
index 78aca7b..67b8cd8 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2.csproj
@@ -36,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>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2_o.csproj b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2_o.csproj
index 697297a..f5fc910 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2_o.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset2_o.csproj
@@ -36,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>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.csproj b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.csproj
index 0f02f06..fa8fb52 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3.csproj
@@ -36,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>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3_o.csproj b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3_o.csproj
index 1886cac..013a3e5 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3_o.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nestedTryRegionsWithSameOffset3_o.csproj
@@ -36,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>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.ilproj b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.ilproj
index b264f0b..f807b9d 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitincatch.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.ilproj b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.ilproj
index 3f800f3..518be5c 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinfinally.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.ilproj b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.ilproj
index 318d6ea..078eff9 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinhandler.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.ilproj b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.ilproj
index 1b57453..efa8038 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitinroot.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitintry.ilproj b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitintry.ilproj
index ba301ba..439bed7 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitintry.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalexitintry.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.csproj b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.csproj
index cbf7c3f..832a3e9 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/FinallyExec/nonlocalgotoinatryblockinahandler.csproj
@@ -35,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>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.csproj b/src/coreclr/tests/src/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.csproj
index c83f277..f47a31d 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/Leaves/nonlocalexitfromnestedcatch.csproj
@@ -35,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>  
   <ItemGroup>  
     <ProjectReference Include="..\Common\common.csproj" />  
   </ItemGroup> 
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter1.ilproj b/src/coreclr/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter1.ilproj
index 1662ec9..604e627 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter1.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter1.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter2.ilproj b/src/coreclr/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter2.ilproj
index 457a319..f359463 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter2.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter2.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter3.ilproj b/src/coreclr/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter3.ilproj
index 3c43332..6aeff70 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter3.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/basics/throwinfinallyintryfilter3.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/eh/basics/throwisfirstinstruction.ilproj b/src/coreclr/tests/src/JIT/jit64/eh/basics/throwisfirstinstruction.ilproj
index 1059454..e23b053 100644
--- a/src/coreclr/tests/src/JIT/jit64/eh/basics/throwisfirstinstruction.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/eh/basics/throwisfirstinstruction.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/gc/misc/148343.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/148343.csproj
index 00d93aa..9be3131 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/148343.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/148343.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/9_and_alloca2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/9_and_alloca2.csproj
index daf8aa2..ba97188 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/9_and_alloca2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/9_and_alloca2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/9param.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/9param.csproj
index 4776ee4..7f33379 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/9param.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/9param.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/alloca3.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/alloca3.csproj
index 8921005..d199b09 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/alloca3.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/alloca3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/eh1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/eh1.csproj
index 763797e..79622d2 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/eh1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/eh1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/fgtest1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/fgtest1.csproj
index 7947f6f..d096ac1 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/fgtest1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/fgtest1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/fgtest2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/fgtest2.csproj
index 2038acb..2b8273a 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/fgtest2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/fgtest2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/funclet.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/funclet.csproj
index aad2dc8..ffe01f2 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/funclet.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/funclet.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/gc/misc/gc-pinned-code-motion.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/gc-pinned-code-motion.csproj
index 4cb5d1e..897253d 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/gc-pinned-code-motion.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/gc-pinned-code-motion.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/gcparaminreg.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/gcparaminreg.csproj
index 5fcdcca..164ba07 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/gcparaminreg.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/gcparaminreg.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/gc/misc/ret_struct_test1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/ret_struct_test1.csproj
index 1619a56..6ac69c6 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/ret_struct_test1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/ret_struct_test1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/ret_struct_test4.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/ret_struct_test4.csproj
index 025dcbc..3a33f44 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/ret_struct_test4.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/ret_struct_test4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/simple1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/simple1.csproj
index 4647105..297f883 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/simple1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/simple1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1.csproj
index 2db8d4a..64c6701 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1_2.csproj
index a4d725b..f1cd1be 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1_4.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1_4.csproj
index 9f14bfb..6f75110 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1_4.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1_4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1_5.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1_5.csproj
index 8acbed3..8c6a7bc 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1_5.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct1_5.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2.csproj
index c9a7dfa..58636ed 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_2.csproj
index 643a3e0..66bdc50 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_4.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_4.csproj
index 94b8be8..ed1772b 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_4.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_5.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_5.csproj
index 659a880..3fb0e9c 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_5.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_5.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_5_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_5_2.csproj
index 053b4f8..198c7de 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_5_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct2_5_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3.csproj
index e1338f5..c42270b 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3_2.csproj
index 3cdfa02..7ecd9c1 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3_4.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3_4.csproj
index 8a2a7dc..5dfcfd4 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3_4.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3_4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3_5.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3_5.csproj
index ddb5a45..a9baa14 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3_5.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct3_5.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4.csproj
index 708e0c7..dd3d47a 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4_2.csproj
index bfd8fe3..7297be6 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4_4.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4_4.csproj
index 8aa3b74..83785a1 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4_4.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4_4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4_5.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4_5.csproj
index ea3d351..8cb67f2 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4_5.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct4_5.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5.csproj
index 53dfc4f..19e4f27 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5_2.csproj
index c027eb6..3f12270 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5_4.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5_4.csproj
index 0ff0bd8..ec32151 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5_4.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5_4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5_5.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5_5.csproj
index a159fea..c9a8dfa 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5_5.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct5_5.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6.csproj
index 5f2da48..9e981bc 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6_2.csproj
index a967fb5..c815763 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6_4.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6_4.csproj
index 8d69133..d158ee6 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6_4.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6_4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6_5.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6_5.csproj
index f6bc983..0e4bea2 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6_5.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct6_5.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct7_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct7_1.csproj
index f60ad59..99c75a1 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct7_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct7_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct8.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct8.csproj
index 61ea547..3fd2481 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct8.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct8.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct9.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct9.csproj
index 4f93167..5caf5e2 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct9.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct9.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/struct9_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct9_2.csproj
index 06d4d0e..3175401 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/struct9_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/struct9_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_1.csproj
index e02496d..f667d95 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_2.csproj
index cb8bc99..f520c26 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_3.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_3.csproj
index e5a5d7b..733f466 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_3.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_4.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_4.csproj
index 2f4ed83..134a38c 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_4.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_5.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_5.csproj
index a4df8de..01c001a 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_5.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_5.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_6.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_6.csproj
index 353652d..123f9a4 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_6.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp1_6.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_1.csproj
index 66bf861..f2afe56 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_2.csproj
index 9196d7a..d579803 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_3.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_3.csproj
index c6026b9..e0b4b01 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_3.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_4.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_4.csproj
index 6a274c8..5c7020b 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_4.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp2_4.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp3_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp3_1.csproj
index 3a2bece..12b7846 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp3_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp3_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp4_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp4_1.csproj
index 5c567af..d514a7b 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp4_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp4_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp5_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp5_1.csproj
index f62e0a0..3910724 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp5_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp5_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp6_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp6_1.csproj
index 365b7bf..016e8c2 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp6_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfp6_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfpseh5_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfpseh5_1.csproj
index b1f8aef..195f29c 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfpseh5_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfpseh5_1.csproj
@@ -36,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structfpseh6_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfpseh6_1.csproj
index 5429eee..8223976 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structfpseh6_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structfpseh6_1.csproj
@@ -36,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structref1_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structref1_1.csproj
index 6e30745..79feb18 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structref1_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structref1_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret1_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret1_1.csproj
index 97185d5..6f56312 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret1_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret1_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret1_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret1_2.csproj
index 979150d..be32b28 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret1_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret1_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret1_3.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret1_3.csproj
index b83bcf5..ca89fe7 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret1_3.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret1_3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret2_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret2_1.csproj
index 6a64166..f2d316d 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret2_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret2_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret2_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret2_2.csproj
index a1d3456..6991991 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret2_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret2_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret2_3.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret2_3.csproj
index abcc1b4..9dbd6be 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret2_3.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret2_3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret3_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret3_1.csproj
index 25e03da..bdab954 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret3_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret3_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret3_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret3_2.csproj
index 9afafdf..70a96d0 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret3_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret3_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret3_3.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret3_3.csproj
index d7ba7df..0f4b221 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret3_3.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret3_3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret4_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret4_1.csproj
index 4114dfb..c78b81f 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret4_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret4_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret4_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret4_2.csproj
index 446cec1..6cc8c12 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret4_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret4_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret4_3.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret4_3.csproj
index 30ecc6a..cb1ff53 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret4_3.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret4_3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret5_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret5_1.csproj
index ff7e6f8..d1640e0 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret5_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret5_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret5_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret5_2.csproj
index 729faff..b007e7d 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret5_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret5_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret5_3.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret5_3.csproj
index 0e2f8bd..e00aef5 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret5_3.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret5_3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret6_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret6_1.csproj
index dab0b4d..87d9778 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret6_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret6_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret6_2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret6_2.csproj
index 45dab1b..d9bbe7c 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret6_2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret6_2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structret6_3.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret6_3.csproj
index 4f21e6f..802a66a 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structret6_3.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structret6_3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/structva1_1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/structva1_1.csproj
index 5784ca0..9953eff 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/structva1_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/structva1_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/test1.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/test1.csproj
index 8626ac3..7e99d29 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/test1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/test1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/test2.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/test2.csproj
index 0b54a8c..fdef174 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/test2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/test2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/test3.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/test3.csproj
index c01ad64..df52a93 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/test3.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/test3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/test_noalloca.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/test_noalloca.csproj
index 588142e..c92631b 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/test_noalloca.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/test_noalloca.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/misc/vbil.csproj b/src/coreclr/tests/src/JIT/jit64/gc/misc/vbil.csproj
index 39b32c2..7aa855f 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/misc/vbil.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/misc/vbil.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/regress/vswhidbey/143837.csproj b/src/coreclr/tests/src/JIT/jit64/gc/regress/vswhidbey/143837.csproj
index 7ec525f..defcf46 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/regress/vswhidbey/143837.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/regress/vswhidbey/143837.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/gc/regress/vswhidbey/339415.csproj b/src/coreclr/tests/src/JIT/jit64/gc/regress/vswhidbey/339415.csproj
index bf76763..e0f18a2 100644
--- a/src/coreclr/tests/src/JIT/jit64/gc/regress/vswhidbey/339415.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/gc/regress/vswhidbey/339415.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/common.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/common.csproj
index b4bc9e6..3f9a433 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/common.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/common.csproj
@@ -36,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/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_common.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_common.csproj
index a0ae76d..b63fb73 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_common.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_common.csproj
@@ -37,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/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_interop_cpp.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_interop_cpp.csproj
index c408d8a..1435383 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_interop_cpp.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_interop_cpp.csproj
@@ -37,10 +37,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/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_managed.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_managed.csproj
index 1fecbcd..8452e8a 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_managed.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f32_managed.csproj
@@ -37,10 +37,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/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_common.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_common.csproj
index b132ab0..84644bc 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_common.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_common.csproj
@@ -37,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/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj
index ff575ae..60e998f 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_interop_cpp.csproj
@@ -41,10 +41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_managed.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_managed.csproj
index b6d11ac..bee0ff7 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_managed.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_nested_f64_managed.csproj
@@ -37,10 +37,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/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_common.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_common.csproj
index 898816b..eb57b23 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_common.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_common.csproj
@@ -37,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/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_interop_cpp.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_interop_cpp.csproj
index c13e432..8b6dc81 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_interop_cpp.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_interop_cpp.csproj
@@ -37,10 +37,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/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_managed.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_managed.csproj
index 74c86f9..29a5e32 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_managed.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f32_managed.csproj
@@ -37,10 +37,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/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_common.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_common.csproj
index 102f915..fc47382 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_common.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_common.csproj
@@ -37,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/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_interop_cpp.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_interop_cpp.csproj
index e1501ac..f68e44a 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_interop_cpp.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_interop_cpp.csproj
@@ -36,11 +36,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/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_managed.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_managed.csproj
index 34665fc..0b39726 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_managed.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/dll/hfa_simple_f64_managed.csproj
@@ -37,10 +37,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj
index e84b803..64c6f93 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj
index f40a3c0..38cf654 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd0A_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj
index 75af864..fb0c530 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj
index f0bacc5..462b8b3 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd1A_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj
index 302f717..0fdd84b 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj
index 920c967..2c1d36f 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nd2A_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj
index 0faa519..157f02c 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj
index e3ae8b8..b119d00 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf0A_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj
index a1d9aad..5723400 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj
index b102bec..8c349f8 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf1A_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj
index b050c9c..bc92dcf 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj
index 339fc51..63fbac5 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_nf2A_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj
index a20ec38..384196b 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj
index 4c71623..883bf2a 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd0A_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj
index f33b114..e28a9d5 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj
index 5d14935..ecbfd1a 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd1A_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj
index 4c287db..4d7ffa5 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj
index 3d87172..2df62e0 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sd2A_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_d.csproj
index a8a25f9..22afd83 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_r.csproj
index affa708..5bea26d 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf0A_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_d.csproj
index e53131e..82e393a 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_r.csproj
index e4adc6f..17a8a29b 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf1A_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_d.csproj
index 75ab22e..2365cec 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_r.csproj
index db8d470..d81fe2c 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testA/hfa_sf2A_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_d.csproj
index 9e62c0d..a1a6b10 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_d.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_r.csproj
index 87e057c..b688acd 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd0B_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_d.csproj
index d6ec211..89318ae 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_d.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_r.csproj
index 637d1e9..97c4522 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nd2B_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_d.csproj
index 28a9c71..0509f92 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_d.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_r.csproj
index 827e92c..4f473cc 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf0B_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_d.csproj
index 2b88d28..10c5f57 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_d.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_r.csproj
index 5f68594..a664e79 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_nf2B_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_d.csproj
index 5b9e855..6590e3d 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_d.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_r.csproj
index 461ac36..57c0cd5 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd0B_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_d.csproj
index 1cbc898..bb50dbf 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_d.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_r.csproj
index 706a9fa..defe4f8 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sd2B_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_d.csproj
index 4167a03..b27dc1f 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_d.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_r.csproj
index 262f8f7..2d3b1b0 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf0B_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_d.csproj
index e7e010e..d9902b6 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_d.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_r.csproj
index 23ef982..c4d9d70 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testB/hfa_sf2B_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_d.csproj
index f238286..81cb4a0 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_r.csproj
index fefe753..348a0d5 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd0C_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_d.csproj
index 06204b6..63b0bca 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_r.csproj
index 76dafa7..dbd967e 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd1C_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_d.csproj
index 60d31a9..a1508cb 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_r.csproj
index 0dbfd53..4207caa 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nd2C_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_d.csproj
index f4aa4dd..74eeb9b 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_r.csproj
index 51c31db..b91bb9c 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf0C_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_d.csproj
index a546610..8dea5e3 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_r.csproj
index d2eb3f6..04faa6f 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf1C_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_d.csproj
index 472eb63..b2ce802 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_r.csproj
index ba58471..9f1b693 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_nf2C_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_d.csproj
index 2c747bb..b231874 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_r.csproj
index 69ee814..acfa505 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd0C_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_d.csproj
index 63da93f..ced1c05 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_r.csproj
index 2c498b1..8107392 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd1C_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_d.csproj
index 11d32df..be91a0d 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_r.csproj
index 8cb4132..3e1849c 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sd2C_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_d.csproj
index e24d475..1dbbe9d 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_r.csproj
index e002d7e..99963b1 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf0C_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_d.csproj
index 3413c65..43e488e 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_r.csproj
index 9eb4f3a..0ce9911 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf1C_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_d.csproj
index d16ec1d..5746718 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_r.csproj
index c36c96e..472301e 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testC/hfa_sf2C_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_d.csproj
index 54409b3..91f647a 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_r.csproj
index 73f0a4c..474d5e7 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd0E_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_d.csproj
index 4bfddb7..e7158ac 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_r.csproj
index ba0e8b0..18c8fe8 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd1E_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_d.csproj
index c80824f..bece854 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_r.csproj
index 919fab6..035d65a 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nd2E_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_d.csproj
index 34c599e6..5db47dc 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_r.csproj
index 6732400..91f86c2 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf0E_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_d.csproj
index cbc5fd6..ac61366 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_r.csproj
index 6dc3e58..262b2fd 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf1E_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_d.csproj
index 67c1f20..fb862b6 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_r.csproj
index 676e886..3ecd4c8 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_nf2E_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_d.csproj
index 7f9098e..cb19d9f 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_r.csproj
index 6d1b47a..daad867 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd0E_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_d.csproj
index 7213abd..b4f3952 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_r.csproj
index 3501f9d..ceb7321 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd1E_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_d.csproj
index 80acf10..fdc73a4 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_r.csproj
index 24b70aa..f6243e5 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sd2E_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_d.csproj
index 62a824e..6cb1899 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_r.csproj
index 69af7d6..7a53efb 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf0E_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_d.csproj
index 634a0d2..1019ffe 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_r.csproj
index 72d472d..a39257d 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf1E_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_d.csproj
index 8d699ff..2d844e7 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_r.csproj
index 238f6d0..18bf1cc 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testE/hfa_sf2E_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_d.csproj
index df64579..6c944ca 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_r.csproj
index b393c8c..77afd18 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd0G_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_d.csproj
index 5b67a3d..f4419b7 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_r.csproj
index 916f9fb..6958ab9 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd1G_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_d.csproj
index e4bcc82..4862e83 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_r.csproj
index 542fe51..f08e114 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nd2G_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_d.csproj
index 42cdfe2..be4c90e 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_r.csproj
index a60e495..3408c164 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf0G_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_d.csproj
index fcf6f23..3c07465 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_r.csproj
index dba28b6..058bf64 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf1G_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_d.csproj
index ba740e7..f24790a 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_r.csproj
index 8afec4f..95afcdd 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_nf2G_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_nested_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_d.csproj
index d3b5775..1b274e1 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_r.csproj
index 7a4a6ec..3f416b06 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd0G_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_d.csproj
index 992cdac..0c1e133 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_r.csproj
index ecce74b..4d2d73b 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd1G_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_d.csproj
index 14cb5ef..b9d18c7 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_r.csproj
index 5760664..1efca4b 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sd2G_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f64_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_d.csproj
index 5402a22..8c014fc 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_r.csproj
index 87832b1..7eb0a07 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf0G_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_d.csproj
index 0fd5b2b..1717baa 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_d.csproj
@@ -40,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_r.csproj
index 0c86afe..d2c631f 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf1G_r.csproj
@@ -41,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/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_d.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_d.csproj
index 503f933..b9562ac 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_d.csproj
@@ -33,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_r.csproj b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_r.csproj
index a42d91a..22d505b 100644
--- a/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/hfa/main/testG/hfa_sf2G_r.csproj
@@ -34,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>
   <ItemGroup>
     <ProjectReference Include="..\dll\common.csproj" />
     <ProjectReference Include="..\dll\hfa_simple_f32_common.csproj" />
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/call/call03_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/call/call03_dynamic.ilproj
index 23fc875..a6bdd71 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/call/call03_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/call/call03_dynamic.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/call/call03_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/call/call03_large.ilproj
index 66e1e88..ce518e9 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/call/call03_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/call/call03_large.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/call/call03_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/call/call03_small.ilproj
index 72efbf6d5..f882b45 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/call/call03_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/call/call03_small.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/call/call04_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/call/call04_dynamic.ilproj
index 6ec2c57..fcad873 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/call/call04_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/call/call04_dynamic.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/call/call04_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/call/call04_large.ilproj
index dd8f993..35109e9 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/call/call04_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/call/call04_large.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/call/call04_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/call/call04_small.ilproj
index 5dea26f..7db1c48 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/call/call04_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/call/call04_small.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/call/call05_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/call/call05_dynamic.ilproj
index e7cdfa6..3f63fa8 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/call/call05_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/call/call05_dynamic.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/call/call05_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/call/call05_large.ilproj
index 06a9485..909812a 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/call/call05_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/call/call05_large.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/call/call05_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/call/call05_small.ilproj
index 37d06ca..c24651a 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/call/call05_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/call/call05_small.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/call/call06_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/call/call06_dynamic.ilproj
index d0fbaed..5c036c3 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/call/call06_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/call/call06_dynamic.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/call/call06_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/call/call06_large.ilproj
index 1ffad06..a1e4522 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/call/call06_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/call/call06_large.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/call/call06_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/call/call06_small.ilproj
index f83ad1d..d7d6c5a 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/call/call06_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/call/call06_small.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/call/call07_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/call/call07_dynamic.ilproj
index a31ca0b..7376721 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/call/call07_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/call/call07_dynamic.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/call/call07_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/call/call07_small.ilproj
index 631adc2..534036d 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/call/call07_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/call/call07_small.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/common/common.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/common/common.ilproj
index f8ba92a..f58e687 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/common/common.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/common/common.ilproj
@@ -37,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/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_dynamic.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_dynamic.csproj
index d1cef01..a336fe8 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_dynamic.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_dynamic.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_large.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_large.csproj
index 3a884d3..88cf996 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_large.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_large.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_small.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_small.csproj
index 66eebbd..2198e45 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_small.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh01_small.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_dynamic.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_dynamic.csproj
index 45cdce7..fd35d1f 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_dynamic.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_dynamic.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_large.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_large.csproj
index 133e29b..57c1e58 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_large.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_large.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_small.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_small.csproj
index 987cc34..b29e095 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_small.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh02_small.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh03_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh03_dynamic.ilproj
index 7b74058..0788436 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh03_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh03_dynamic.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh03_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh03_large.ilproj
index 071a801..a8a1dbf 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh03_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh03_large.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh03_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh03_small.ilproj
index 56d9950..8f93773 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh03_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh03_small.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh04_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh04_dynamic.ilproj
index 21ff6cf..51465b9 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh04_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh04_dynamic.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh04_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh04_large.ilproj
index 4d718d2..5f8e6f3 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh04_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh04_large.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh04_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh04_small.ilproj
index c975c92..43170dd 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh04_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/eh/eh04_small.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh05_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh05_dynamic.ilproj
index 01aa1ac..d685d0c 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh05_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh05_dynamic.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh05_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh05_large.ilproj
index 334772f..fe7c9b3 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh05_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh05_large.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh05_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh05_small.ilproj
index 5519833..7ed3247 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh05_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh05_small.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh06_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh06_dynamic.ilproj
index 2a05292..f4f0bee 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh06_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh06_dynamic.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh06_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh06_large.ilproj
index 25783e2..1bceb59 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh06_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh06_large.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh06_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh06_small.ilproj
index 7f25dbf..c832040 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh06_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh06_small.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh07_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh07_dynamic.ilproj
index 179dcfe..056d15b 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh07_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh07_dynamic.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh07_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh07_large.ilproj
index fb21514..f033b2f 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh07_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh07_large.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh07_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh07_small.ilproj
index fecdd70..7705fdb 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh07_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh07_small.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh08_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh08_dynamic.ilproj
index c5aebf6..8c56218 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh08_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh08_dynamic.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh08_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh08_large.ilproj
index f607c8b..b419e5d 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh08_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh08_large.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh08_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh08_small.ilproj
index 61d7afd..af99992 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh08_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh08_small.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_dynamic.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_dynamic.csproj
index 702ec9a..473d813 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_dynamic.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_dynamic.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_large.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_large.csproj
index 702ec9a..473d813 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_large.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_large.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_small.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_small.csproj
index 702ec9a..473d813 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_small.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh09_small.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh11_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh11_dynamic.ilproj
index 5bf009f..913f308 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh11_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh11_dynamic.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh11_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh11_large.ilproj
index beb0ff7..9d51505 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh11_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh11_large.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh11_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh11_small.ilproj
index 4d28251..be0a595 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh11_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh11_small.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh12_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh12_dynamic.ilproj
index 5e1ab4a..fd9e19b 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh12_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh12_dynamic.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh12_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh12_large.ilproj
index f92c21d..a2b59d6 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh12_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh12_large.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh12_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh12_small.ilproj
index 0bf968f..298eaf6 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh12_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh12_small.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh13_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh13_dynamic.ilproj
index f2700e3..0894320 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh13_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh13_dynamic.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh13_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh13_large.ilproj
index 9763773..6e6a8a8 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh13_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh13_large.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh13_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh13_small.ilproj
index 6d56445..572e68a 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh13_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/ehverify/eh13_small.ilproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="..\common\common.ilproj" />
   </ItemGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_dynamic.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_dynamic.csproj
index 6a191e5..bb48f85 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_dynamic.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_dynamic.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_large.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_large.csproj
index 183d645..4677b68 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_large.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_large.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_small.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_small.csproj
index f3fd813..9d7e7d1 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_small.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind01_small.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_dynamic.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_dynamic.csproj
index b4ef611..122d1c8 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_dynamic.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_dynamic.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_large.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_large.csproj
index 217cef9..f47a88c 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_large.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_large.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_small.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_small.csproj
index 1ee7711..2f13c45 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_small.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind02_small.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_dynamic.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_dynamic.csproj
index 4bb751f..48c4453 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_dynamic.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_dynamic.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_large.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_large.csproj
index 3ce83c5..63e4cd4 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_large.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_large.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_small.csproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_small.csproj
index 8993005..4990d8a 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_small.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind03_small.csproj
@@ -40,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/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind04_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind04_dynamic.ilproj
index 8a5657e..ed49258 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind04_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind04_dynamic.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind04_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind04_large.ilproj
index 2e133e0..dbf84c6 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind04_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind04_large.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind04_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind04_small.ilproj
index b1967f1..f9326d8 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind04_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind04_small.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind05_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind05_dynamic.ilproj
index 20a1b0f..a619748 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind05_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind05_dynamic.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind05_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind05_large.ilproj
index ed76bd8..16caa33 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind05_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind05_large.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind05_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind05_small.ilproj
index 0b23420..646b62e 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind05_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind05_small.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind06_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind06_dynamic.ilproj
index 15bd254..9f1ffaf 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind06_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind06_dynamic.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind06_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind06_large.ilproj
index 0bc8528..82f5bb8 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind06_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind06_large.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind06_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind06_small.ilproj
index e55fa94..48e1fbb 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind06_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/unwind/unwind06_small.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/verify/verify01_dynamic.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/verify/verify01_dynamic.ilproj
index 57b1ecf..68a1fcd 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/verify/verify01_dynamic.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/verify/verify01_dynamic.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/verify/verify01_large.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/verify/verify01_large.ilproj
index a5be1cc..f013b98 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/verify/verify01_large.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/verify/verify01_large.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/localloc/verify/verify01_small.ilproj b/src/coreclr/tests/src/JIT/jit64/localloc/verify/verify01_small.ilproj
index 730acf2..f930f2c 100644
--- a/src/coreclr/tests/src/JIT/jit64/localloc/verify/verify01_small.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/localloc/verify/verify01_small.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj
index d4b2068..64f3677 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj
index aad3884..e23e1b3 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj
index 8896889..c40106e 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj
index 676bc29..958f913 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj
index 53cb55c..019627e 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj
index 11c5f98..0220ae9 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj
index 7491be2..079161a 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj
index 24c8a6c..e4cf2d3 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj
index 3d596c1..fc30a86 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj
index 9af2fb1..9cc75e6 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj
index 220fa02..456c86a 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj
index ea02a8f..0d84168 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj
index f925e5a..a5b27fd 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj
index 51322ac..1c33fac 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj
index 56344ac..534dd65 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj
index 5bce22a..b739b9d 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj
index 06714e3..f9419b7 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj
@@ -39,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/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj
index e5e7ee7..89513a5 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj
index fc845ce..c497c50 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj
@@ -39,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/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj
index db9dfae..6f4babe 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj
index 0ed20e8..5b97377 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj
index d10bd79..2472fbf 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj
index 40d5ecb..424ed0c 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj
index 5011593..4815bd3 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj
index c8d4993..5a05016 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj
index 7a77e23..7b41bac 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj
index 681b019..3dcc977 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj
index 76f67ca..52a670f 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_d.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_d.csproj
index 0c50723..13c5f2b 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_do.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_do.csproj
index 313829f..d9c78ae 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_do.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_r.csproj
index 1e17040..7a73a81 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_ro.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_ro.csproj
index 5fa8e15..526d101 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_ro.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cprop/cprop001_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cprop/implicitDownConv.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cprop/implicitDownConv.csproj
index e2ad9ed..4a90977 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cprop/implicitDownConv.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cprop/implicitDownConv.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeArray.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeArray.csproj
index 166482b..55dce54 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeArray.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeArray.csproj
@@ -38,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/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeArray1.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeArray1.csproj
index ebe0981..fe908c4 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeArray1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeArray1.csproj
@@ -36,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/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeField1.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeField1.csproj
index 3ac6fca..a560f3c 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeField1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeField1.csproj
@@ -36,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/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeField2.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeField2.csproj
index 27d9b2a..d000d53 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeField2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/HugeField2.csproj
@@ -36,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/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_add.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_add.csproj
index 0d0a491..2af0be7 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_add.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_add.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_and.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_and.csproj
index ebd9490..6d94fde 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_and.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_and.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_div.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_div.csproj
index fcb46fb..05627da 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_div.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_div.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mod.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mod.csproj
index 28d5ff0..aaf9953 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mod.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mod.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mul.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mul.csproj
index af81c6d..7b2c6b8 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mul.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_mul.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_or.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_or.csproj
index 3fffa84..ca167ae 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_or.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_or.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_shr.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_shr.csproj
index 689d97f..3aba7bf 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_shr.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_shr.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_sub.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_sub.csproj
index 68f3f6d..f1d64b9 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_sub.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_sub.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_xor.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_xor.csproj
index 008b574..3f2ff99 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_xor.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/VolatileTest_op_xor.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,10 +39,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr1.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr1.csproj
index e67b1d5..21a2c32 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr1.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_d_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_d_loop_try.csproj
index ea5b4dc..272234f 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_d_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_d_loop_try.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r.csproj
index 2009ef9..c45f97a 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop.csproj
index 75f0d63..6ea9858 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop_try.csproj
index 62ead2d..814a34a 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_loop_try.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_try.csproj
index b6f76af..c890e01 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_r_try.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_ro_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_ro_loop.csproj
index 5d93129..2df3c61 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_ro_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/arrayexpr2_ro_loop.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldExprUnchecked1.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldExprUnchecked1.csproj
index 831a909..da195cc 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldExprUnchecked1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldExprUnchecked1.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldexpr1.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldexpr1.csproj
index 75b6c36..dc915a9 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldexpr1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldexpr1.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldexpr1_1.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldexpr1_1.csproj
index 29526dd..0fbd909 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldexpr1_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldexpr1_1.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldexpr2.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldexpr2.csproj
index 3b27c37..a15db6a 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldexpr2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/fieldexpr2.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj
index 806ab52..d676401 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj
index 3ad363f..a820eb5 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj
@@ -38,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/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_d_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_d_loop_try.csproj
index 616275f..182238f 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_d_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_d_loop_try.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r.csproj
index b9d311e..c5c4a7b 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop.csproj
index 6aa938d..99e7d9b 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop_try.csproj
index 894da97..a6c8380 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_loop_try.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_try.csproj
index c763e5e..85bed57 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_r_try.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_ro_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_ro_loop.csproj
index 72a6b5c..7604550 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_ro_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/mixedexpr1_ro_loop.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj
index d94a44b..a9faa4a 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cse/pointerexpr1_1.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/pointerexpr1_1.csproj
index 8cd9605..c874abc 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/pointerexpr1_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/pointerexpr1_1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr1.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr1.csproj
index e42f8e5..782a618 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr1.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr1_1.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr1_1.csproj
index 7b29797..a0248e6 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr1_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr1_1.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr2.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr2.csproj
index eefa092..122195d 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr2.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr3.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr3.csproj
index edab2d8..1b8d35c 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr3.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr3.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_d_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_d_loop_try.csproj
index 318c528..f68b969 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_d_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_d_loop_try.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r.csproj
index de8bd90..d7261c4 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop.csproj
index 8c591af..ee2d11e 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop_try.csproj
index 534a3ea..ff4039b 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_loop_try.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_try.csproj
index 2c99955..0d29b50 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_r_try.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_ro_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_ro_loop.csproj
index ab74b7b..2e6fa8b 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_ro_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/simpleexpr4_ro_loop.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_1.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_1.csproj
index 5d60858..29d8690 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_1.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_d_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_d_loop_try.csproj
index 0e1511f..fecffa2 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_d_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_d_loop_try.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r.csproj
index 9e98b7c..399c21c 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop.csproj
index 589e74c..56321e6 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop_try.csproj
index 6b8369eb..a2b466d 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_loop_try.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_try.csproj
index 2cf4f2e..690d67d 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r_try.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_ro_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_ro_loop.csproj
index d1fdeea..d6a6554 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_ro_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_ro_loop.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_d_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_d_loop_try.csproj
index a505753..93ca472 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_d_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_d_loop_try.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj
index 4b9c0b1..ea852d3 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop.csproj
index da103fa..968eed3 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop_try.csproj
index f90dab9..6996e7a 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_loop_try.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_try.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_try.csproj
index 8d7294b..e642297 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_try.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r_try.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_ro_loop.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_ro_loop.csproj
index 3f59e30..b6bfceb 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_ro_loop.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_ro_loop.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/opt/cse/volatilefield.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/volatilefield.csproj
index acdc1fd..539ec31 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/volatilefield.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/volatilefield.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/opt/cse/volatilestaticfield.csproj b/src/coreclr/tests/src/JIT/jit64/opt/cse/volatilestaticfield.csproj
index b6db4e8..0a9cf5a 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/cse/volatilestaticfield.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/cse/volatilestaticfield.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_d.csproj b/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_d.csproj
index 3ed9a1b..71ff9b4 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_d.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_d.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_do.csproj b/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_do.csproj
index 0c5f698..40608b6 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_do.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_do.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_r.csproj b/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_r.csproj
index 172a0c6..80fe950 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_r.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_r.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_ro.csproj b/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_ro.csproj
index 0456305..07b8e2a 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_ro.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/inl/caninline_ro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/lim/lim_002.csproj b/src/coreclr/tests/src/JIT/jit64/opt/lim/lim_002.csproj
index 47bc04e..1d9e8d5 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/lim/lim_002.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/lim/lim_002.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/opt/lur/lur_02.csproj b/src/coreclr/tests/src/JIT/jit64/opt/lur/lur_02.csproj
index 7ab316c..2ffcd24 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/lur/lur_02.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/lur/lur_02.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/opt/osr/osr001.csproj b/src/coreclr/tests/src/JIT/jit64/opt/osr/osr001.csproj
index 7a7d617..f5796e8 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/osr/osr001.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/osr/osr001.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_udo.csproj b/src/coreclr/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_udo.csproj
index 47e133a..1f61173 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_udo.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_udo.csproj
@@ -36,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/src/coreclr/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_uro.csproj b/src/coreclr/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_uro.csproj
index 6014c57..1b86c24 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_uro.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/regress/vswhidbey/193825/193825_uro.csproj
@@ -36,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/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayBound_o.csproj b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayBound_o.csproj
index a0758d3..50b5140 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayBound_o.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayBound_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWith2Loops_o.csproj b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWith2Loops_o.csproj
index 5c6f232..9875426 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWith2Loops_o.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWith2Loops_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWithFunc_o.csproj b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWithFunc_o.csproj
index 9ea5282..47888c9 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWithFunc_o.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWithFunc_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.csproj b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.csproj
index 421a00d..506d64b 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/ArrayWithThread_o.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,10 +40,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/opt/rngchk/BadMatrixMul_o.csproj b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/BadMatrixMul_o.csproj
index 328a48d..6f2275d 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/rngchk/BadMatrixMul_o.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/BadMatrixMul_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/rngchk/JaggedArray_o.csproj b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/JaggedArray_o.csproj
index 41d274c..d26723e 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/rngchk/JaggedArray_o.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/JaggedArray_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/rngchk/MatrixMul_o.csproj b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/MatrixMul_o.csproj
index fc333dc..e31ddd5 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/rngchk/MatrixMul_o.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/MatrixMul_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/rngchk/RngchkStress1_o.csproj b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/RngchkStress1_o.csproj
index 76b4d0a..390912a 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/rngchk/RngchkStress1_o.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/RngchkStress1_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/rngchk/RngchkStress2_o.csproj b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/RngchkStress2_o.csproj
index e20486f..17b00ba 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/rngchk/RngchkStress2_o.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/RngchkStress2_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/rngchk/RngchkStress3.csproj b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/RngchkStress3.csproj
index b59e249..23b6255 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/rngchk/RngchkStress3.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/RngchkStress3.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/opt/rngchk/SimpleArray_01_o.csproj b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/SimpleArray_01_o.csproj
index b197242..50a0bf0 100644
--- a/src/coreclr/tests/src/JIT/jit64/opt/rngchk/SimpleArray_01_o.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/opt/rngchk/SimpleArray_01_o.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/regress/asurt/143616/foo.csproj b/src/coreclr/tests/src/JIT/jit64/regress/asurt/143616/foo.csproj
index 158bbfd..bdd238b 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/asurt/143616/foo.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/asurt/143616/foo.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/regress/ddb/103087/103087.csproj b/src/coreclr/tests/src/JIT/jit64/regress/ddb/103087/103087.csproj
index cdfdf8b..db629f7 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/ddb/103087/103087.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/ddb/103087/103087.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/regress/ddb/113574/113574.csproj b/src/coreclr/tests/src/JIT/jit64/regress/ddb/113574/113574.csproj
index 92766ca..2a62f29 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/ddb/113574/113574.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/ddb/113574/113574.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj b/src/coreclr/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj
index 1992610..a69898f 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/regress/ddb/87766/ddb87766.csproj b/src/coreclr/tests/src/JIT/jit64/regress/ddb/87766/ddb87766.csproj
index 54c0f89..a84f4ae 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/ddb/87766/ddb87766.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/ddb/87766/ddb87766.csproj
@@ -38,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/src/coreclr/tests/src/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj b/src/coreclr/tests/src/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj
index 745f48e..42a7bb3 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/ndpw/14888/objectusedonlyinhandler.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/regress/ndpw/160545/simple.csproj b/src/coreclr/tests/src/JIT/jit64/regress/ndpw/160545/simple.csproj
index 16df98a..a4ff138 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/ndpw/160545/simple.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/ndpw/160545/simple.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/regress/ndpw/21015/interior_pointer.csproj b/src/coreclr/tests/src/JIT/jit64/regress/ndpw/21015/interior_pointer.csproj
index 3b27978..7e6e77f 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/ndpw/21015/interior_pointer.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/ndpw/21015/interior_pointer.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/regress/ndpw/21220/b21220.ilproj b/src/coreclr/tests/src/JIT/jit64/regress/ndpw/21220/b21220.ilproj
index 777ffc6..8af34d0 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/ndpw/21220/b21220.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/ndpw/21220/b21220.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/regress/vsw/102754/test1.ilproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/102754/test1.ilproj
index 6a896d5..bdaf779 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/102754/test1.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/102754/test1.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/regress/vsw/102964/test.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/102964/test.csproj
index 593d943..36fec1c 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/102964/test.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/102964/test.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/286991/test.ilproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/286991/test.ilproj
index 7137c6a..1ef3bcd 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/286991/test.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/286991/test.ilproj
@@ -35,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>
 </Project>
\ No newline at end of file
diff --git a/src/coreclr/tests/src/JIT/jit64/regress/vsw/329169/test.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/329169/test.csproj
index 2a58ebc..50f1274 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/329169/test.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/329169/test.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/373472/test.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/373472/test.csproj
index 64719ae..9adf882 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/373472/test.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/373472/test.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/471729/test.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/471729/test.csproj
index c2e880a..e3190dd 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/471729/test.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/471729/test.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/517867/test.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/517867/test.csproj
index ca686c8..fed7f74 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/517867/test.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/517867/test.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/524070/test1.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/524070/test1.csproj
index 3e87e5a..378fce0 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/524070/test1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/524070/test1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/524070/test2.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/524070/test2.csproj
index 0702e0e..dd46c92 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/524070/test2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/524070/test2.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/528315/simple-repro.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/528315/simple-repro.csproj
index 2ddebc2..6d3296b 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/528315/simple-repro.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/528315/simple-repro.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/538615/test1.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/538615/test1.csproj
index 5ecac3b..4257e2e 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/538615/test1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/538615/test1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/539509/test1.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/539509/test1.csproj
index dff7c37..a6ed1fc 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/539509/test1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/539509/test1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/541067/test1.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/541067/test1.csproj
index 46ca6af..58e453f 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/541067/test1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/541067/test1.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/543229/test.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/543229/test.csproj
index 66902ca..59d44f0 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/543229/test.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/543229/test.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/543645/test.ilproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/543645/test.ilproj
index 000d60e..d460ba53 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/543645/test.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/543645/test.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/regress/vsw/549880/test.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/549880/test.csproj
index 4ce5154..4511da9 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/549880/test.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/549880/test.csproj
@@ -34,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/552940/test.ilproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/552940/test.ilproj
index 000d60e..d460ba53 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/552940/test.ilproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/552940/test.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opadd.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opadd.csproj
index 43d6aec..a2ba355 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opadd.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opadd.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opmul.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opmul.csproj
index c36938d..de81175 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opmul.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opmul.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opsub.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opsub.csproj
index 805dcdd..f3f9fa7 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opsub.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/560402/opsub.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/library1.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/library1.csproj
index 891a5b0..f6ddb4d 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/library1.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/library1.csproj
@@ -37,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/library2.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/library2.csproj
index 891a5b0..f6ddb4d 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/library2.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/library2.csproj
@@ -37,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/test.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/test.csproj
index aa36b11..7060f87 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/test.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/568666/test.csproj
@@ -45,10 +45,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/jit64/regress/vsw/601425/stret.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/601425/stret.csproj
index 01e7d08..3997841 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/601425/stret.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/601425/stret.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.csproj b/src/coreclr/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.csproj
index 90f3e50..8c91261 100644
--- a/src/coreclr/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_add.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_add.csproj
index 9c34e53..630caf9 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_add.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_add.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_div.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_div.csproj
index 0392354..5a53e7b 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_div.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_div.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_mul.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_mul.csproj
index 0bf203d..35bd58e 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_mul.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_mul.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_sub.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_sub.csproj
index 60fc5dd..fe0c5be 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_sub.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow01_sub.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_add.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_add.csproj
index 1c1d076..a9cae69 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_add.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_add.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_div.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_div.csproj
index 693cdfb..de6e6dc 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_div.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_div.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_mul.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_mul.csproj
index 1679bb7..f305881 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_mul.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_mul.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_sub.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_sub.csproj
index 296399f..a9ba094 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_sub.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow02_sub.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_add.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_add.csproj
index 73530a6..3ebe3e3 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_add.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_add.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_div.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_div.csproj
index 1210b2b..1065260 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_div.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_div.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_mul.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_mul.csproj
index 69fef50..35bf1f8 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_mul.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_mul.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_sub.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_sub.csproj
index 62b91d2..99e55a7 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_sub.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow03_sub.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_add.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_add.csproj
index a66b580..4eef1bf 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_add.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_add.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_div.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_div.csproj
index b089ff0..d10ca2d 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_div.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_div.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_mul.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_mul.csproj
index 66543c4..758a3f4 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_mul.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_mul.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_sub.csproj b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_sub.csproj
index 3de0067..f92a237 100644
--- a/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_sub.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/rtchecks/overflow/overflow04_sub.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox001.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox001.csproj
index cf9059f..f544e6f 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox001.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox001.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox002.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox002.csproj
index 0b84c43..1c9af12 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox002.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox002.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox003.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox003.csproj
index d72ab8c..8a66b66 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox003.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox003.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox004.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox004.csproj
index 26c2b54..a2c3e33 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox004.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox004.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox005.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox005.csproj
index 33f07d0..0d8fac6 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox005.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox005.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox006.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox006.csproj
index 093290e..b0f92c6 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox006.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox006.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox007.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox007.csproj
index edee135..2509afe 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox007.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox007.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox008.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox008.csproj
index 8e66242..d8e816c 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox008.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox008.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox009.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox009.csproj
index 35a9267..459586c 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox009.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox009.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox010.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox010.csproj
index 9543a46..a61a4fd 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox010.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox010.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox011.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox011.csproj
index 2ff7951..382ceac 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox011.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox011.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox012.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox012.csproj
index 31776c9..6049519 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox012.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox012.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox013.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox013.csproj
index 746f559..d250dec 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox013.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox013.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox014.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox014.csproj
index bd6a43e..d433c6d 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox014.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox014.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox015.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox015.csproj
index 811ef13..3d8b002 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox015.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox015.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox016.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox016.csproj
index b4853cb..e26861b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox016.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox016.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox017.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox017.csproj
index 82d2a7a..f76810e 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox017.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox017.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox018.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox018.csproj
index ce45b03..5b4ef02 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox018.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox018.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox019.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox019.csproj
index 3e93a29..01f8521 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox019.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox019.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox020.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox020.csproj
index f6338d05..29d41c8 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox020.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox020.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox021.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox021.csproj
index 8d2a7d6..0db555b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox021.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox021.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox022.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox022.csproj
index 3324e13..89574da 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox022.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox022.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox023.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox023.csproj
index 6a26fd1..a8a4f13 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox023.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox023.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox024.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox024.csproj
index 3ec5f96..403bddc 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox024.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox024.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox025.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox025.csproj
index 51673d9..bfdbed0 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox025.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox025.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox026.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox026.csproj
index aa0aaa5..e5096f7 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox026.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox026.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox027.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox027.csproj
index bfaa81b..5f8e848 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox027.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox027.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox028.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox028.csproj
index 41bb2ef..1c318a7 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox028.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox028.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox029.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox029.csproj
index 47f802e..8e98008 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox029.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox029.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox030.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox030.csproj
index 84f9609..fdd5754 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox030.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox030.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox031.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox031.csproj
index ae08240..253322d 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox031.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox031.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox032.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox032.csproj
index 54bbd84..4f379d1 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox032.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox032.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox033.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox033.csproj
index 2bcbeed..40c9da8 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox033.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox033.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox034.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox034.csproj
index 94c63c9..eecf984 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox034.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox034.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox037.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox037.csproj
index f28b5c1..ddd9a10 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox037.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox037.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox038.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox038.csproj
index 17971a8..7d75282 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox038.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox038.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox039.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox039.csproj
index d329b9f..450af15 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox039.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox039.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox040.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox040.csproj
index b65c819..7b0595e 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox040.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox040.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox041.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox041.csproj
index c681f13..be871ae 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox041.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox041.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox042.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox042.csproj
index 461b2fd..f809721 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox042.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox042.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox043.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox043.csproj
index 77c2c14..347417e 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox043.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox043.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox044.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox044.csproj
index dff3f65..ad1d794 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox044.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox044.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox045.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox045.csproj
index 7506cd7..5ede4ab 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox045.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/box-unbox/box-unbox045.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum001.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum001.csproj
index c47cfa1..4db98e9 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum001.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum001.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum002.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum002.csproj
index 076e64d..6a3453c 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum002.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum002.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum003.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum003.csproj
index a951df1..a0b0039 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum003.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/enum/box-unbox-enum003.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics001.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics001.csproj
index 99d173d..535fd83 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics001.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics001.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics002.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics002.csproj
index 24e0252..eca1f4d 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics002.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics002.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics003.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics003.csproj
index 28b03f9..52a8ed0 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics003.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics003.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics004.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics004.csproj
index 655c3f2..3149fac 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics004.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics004.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics005.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics005.csproj
index 636fdf5..736d04c 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics005.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics005.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics006.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics006.csproj
index 0acab99..3cefbcd 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics006.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics006.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics007.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics007.csproj
index 7b556aa..1cc4211 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics007.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics007.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics008.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics008.csproj
index 8fe02d9..97d4192 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics008.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics008.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics009.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics009.csproj
index 39c36ce..2281459 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics009.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics009.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics010.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics010.csproj
index 099b079..5cf7e59 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics010.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics010.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics011.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics011.csproj
index 349a661..d2f679a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics011.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics011.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics012.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics012.csproj
index e6fa0de..f6ff76b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics012.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics012.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics013.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics013.csproj
index 7121ccb..f187588 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics013.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics013.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics014.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics014.csproj
index 84f32c1..3a77630 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics014.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics014.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics015.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics015.csproj
index 6fa0cf7..93611e6 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics015.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics015.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics016.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics016.csproj
index 4226bfd..d60f1a2 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics016.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics016.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics017.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics017.csproj
index 6aa454f..86db3d7 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics017.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics017.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics018.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics018.csproj
index 3da870f..5391015 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics018.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics018.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics019.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics019.csproj
index a2b9c09..4df6809 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics019.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics019.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics020.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics020.csproj
index e2c3b6d..3c8d8cd 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics020.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics020.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics021.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics021.csproj
index 16c7a7b..9356a25 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics021.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics021.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics022.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics022.csproj
index c107d8b..d25382c 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics022.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics022.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics023.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics023.csproj
index 7fdf109..8dc5f59 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics023.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics023.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics024.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics024.csproj
index 8d52be5..f32fb63 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics024.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics024.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics025.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics025.csproj
index e052aae..a6aff69 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics025.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics025.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics026.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics026.csproj
index f10526c..f6314c2 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics026.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics026.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics027.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics027.csproj
index 30a6455..56f5bbe 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics027.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics027.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics028.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics028.csproj
index 4d56548..bf9670b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics028.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics028.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics029.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics029.csproj
index c549cac..e2062cb 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics029.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics029.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics030.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics030.csproj
index 417474d..e00aa01 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics030.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics030.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics031.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics031.csproj
index 2896275..bbd3a22 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics031.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics031.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics032.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics032.csproj
index 8ff18f6..48b46a5 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics032.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics032.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics033.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics033.csproj
index 844d882..ec5e882 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics033.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics033.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics034.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics034.csproj
index 3ca8544..c79af0d 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics034.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics034.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics037.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics037.csproj
index e2ccbc5..b2a1494 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics037.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics037.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics038.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics038.csproj
index dc612c0..32fe3b7 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics038.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics038.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics039.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics039.csproj
index 2f2142e..e82e276 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics039.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics039.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics040.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics040.csproj
index c978126..07757ed 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics040.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics040.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics041.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics041.csproj
index 95cf85e..4269808 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics041.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics041.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics042.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics042.csproj
index 99c6aad..a6ec341 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics042.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics042.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics043.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics043.csproj
index 39dc508..98e16e6 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics043.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics043.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics044.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics044.csproj
index b844e2e..503e7ee 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics044.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics044.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics045.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics045.csproj
index d1572f4..4f46670 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics045.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/generics/box-unbox-generics045.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface001.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface001.csproj
index 746e32f..15530bb 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface001.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface001.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface002.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface002.csproj
index ed0a316..9c42420 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface002.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface002.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface003.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface003.csproj
index 9fa3267..1d052c6 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface003.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface003.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface004.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface004.csproj
index 1739299..0dbedb1 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface004.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface004.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface005.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface005.csproj
index 178f217..85f23cf 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface005.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface005.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface006.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface006.csproj
index c027e05..0d3a0a5 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface006.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface006.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface007.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface007.csproj
index 2eb7f1a..3744bcd 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface007.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface007.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface008.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface008.csproj
index 8d126ad..91d90dc 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface008.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface008.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface009.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface009.csproj
index 21701d6..c7e5e7e 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface009.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface009.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface010.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface010.csproj
index f4e8384..c41be2e 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface010.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface010.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface011.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface011.csproj
index feb0484..df01818 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface011.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface011.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface012.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface012.csproj
index 2e31fbc..d46c6b6 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface012.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface012.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface013.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface013.csproj
index 0eede7a..938c695 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface013.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface013.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface014.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface014.csproj
index a3a7c11..8cbaa83 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface014.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface014.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface015.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface015.csproj
index 42437e5..df542ae 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface015.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface015.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface016.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface016.csproj
index 695af38..0a03cbc 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface016.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface016.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface017.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface017.csproj
index 60a12d6..d26844a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface017.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface017.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface018.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface018.csproj
index 54049e7..cc781be 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface018.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/interface/box-unbox-interface018.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null001.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null001.csproj
index b863daf..e653277 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null001.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null001.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null002.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null002.csproj
index 74cbcce..809a4ae 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null002.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null002.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null003.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null003.csproj
index 66e6024..f4de797 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null003.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null003.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null004.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null004.csproj
index 63e03f5..48858a8 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null004.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null004.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null005.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null005.csproj
index f6238ae..4f0f3cd 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null005.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null005.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null006.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null006.csproj
index 0fe4f01..f234ba2 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null006.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null006.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null007.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null007.csproj
index 959c6a9..4aa2931 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null007.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null007.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null008.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null008.csproj
index 9661663..2fcd9c6 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null008.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null008.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null009.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null009.csproj
index c7ebd73..ae29756 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null009.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null009.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null010.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null010.csproj
index c595845..f6b7312 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null010.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null010.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null011.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null011.csproj
index 9d560f1..8e12cc6 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null011.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null011.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null012.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null012.csproj
index c2c9d27..4758823 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null012.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null012.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null013.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null013.csproj
index 0777244..42aad2d 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null013.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null013.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null014.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null014.csproj
index 125a943..68ab87a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null014.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null014.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null015.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null015.csproj
index aa00e03..000b3a5 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null015.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null015.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null016.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null016.csproj
index 7ef6b85..9480be8 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null016.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null016.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null017.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null017.csproj
index b39d6b7..82d29e2 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null017.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null017.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null018.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null018.csproj
index 045d1bc..eadc66b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null018.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null018.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null019.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null019.csproj
index 892e32b..1817c8c 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null019.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null019.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null020.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null020.csproj
index cd61ca8..86e60cf 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null020.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null020.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null021.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null021.csproj
index c230044..e0af5f0 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null021.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null021.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null022.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null022.csproj
index d03a7a9..a8edacf 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null022.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null022.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null023.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null023.csproj
index 7635d2c..37c4628 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null023.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null023.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null024.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null024.csproj
index be705bd..7d6cb58 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null024.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null024.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null025.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null025.csproj
index 2001470..9d2b3e6 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null025.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null025.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null026.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null026.csproj
index 15ac847..d3fa231 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null026.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null026.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null027.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null027.csproj
index 65d0203..3c32eaa 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null027.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null027.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null028.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null028.csproj
index 14ec3e7..5ed3ac3 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null028.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null028.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null029.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null029.csproj
index 6fc6b71..0a9e231 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null029.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null029.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null030.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null030.csproj
index 4fe135e..269e64e 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null030.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null030.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null031.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null031.csproj
index 23a8011..831c7a7 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null031.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null031.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null032.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null032.csproj
index a9d0c0b..67b0ff6 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null032.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null032.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null033.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null033.csproj
index 6937946..74ce39d 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null033.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null033.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null034.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null034.csproj
index 503a08e..693fd7b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null034.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null034.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null037.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null037.csproj
index 14abe90..fccb364 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null037.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null037.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null038.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null038.csproj
index 15f2122..ac14554 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null038.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null038.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null039.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null039.csproj
index b49487b..a97a867 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null039.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null039.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null040.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null040.csproj
index a6f12f0..9c34791 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null040.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null040.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null041.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null041.csproj
index d574a0e..a6f94ef 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null041.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null041.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null042.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null042.csproj
index 20c5db3..ed9df6a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null042.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null042.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null043.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null043.csproj
index 7bd27dd..df26b85 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null043.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null043.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null044.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null044.csproj
index 8982a5f..beb2838 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null044.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null044.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null045.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null045.csproj
index 7592b72..fb36c56 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null045.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/null/box-unbox-null045.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value001.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value001.csproj
index 19215ee..b059d97 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value001.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value001.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value002.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value002.csproj
index 1ad5728..959f83d 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value002.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value002.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value003.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value003.csproj
index 59c2cb1..b889d9a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value003.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value003.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value004.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value004.csproj
index 09955a8..d5ee8f7 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value004.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value004.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value005.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value005.csproj
index 2ba80c6..912ca15 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value005.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value005.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value006.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value006.csproj
index e2a1fe4..6a05c70 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value006.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value006.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value007.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value007.csproj
index c2578ce..bf66e2b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value007.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value007.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value008.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value008.csproj
index 50e72b3..4249819 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value008.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value008.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value009.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value009.csproj
index 4ba150c..1edec46 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value009.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value009.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value010.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value010.csproj
index 4b3dbf3..2925805 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value010.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value010.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value011.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value011.csproj
index 033b305..768a408 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value011.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value011.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value012.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value012.csproj
index b92280a..d420016 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value012.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value012.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value013.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value013.csproj
index 6b17f28..ed2df98 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value013.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value013.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value014.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value014.csproj
index d29b3d8..436e693 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value014.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value014.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value015.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value015.csproj
index 5f41e02..7c496d5 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value015.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value015.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value016.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value016.csproj
index a4c7b29..cda6fee 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value016.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value016.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value017.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value017.csproj
index eb34d24..5dd2be3 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value017.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value017.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value018.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value018.csproj
index 30b379f..828a859 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value018.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value018.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value019.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value019.csproj
index e1d1b77..2639faa 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value019.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value019.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value020.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value020.csproj
index 16cbfec..c6d8521 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value020.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value020.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value021.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value021.csproj
index 29727c2..b600157 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value021.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value021.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value022.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value022.csproj
index 330a02e..3132579 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value022.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value022.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value023.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value023.csproj
index a17ce52..b18e34a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value023.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value023.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value024.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value024.csproj
index 9cd5b93..7e743f3 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value024.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value024.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value025.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value025.csproj
index 03cea1e..f97309d 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value025.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value025.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value026.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value026.csproj
index d3b0884..7087dc9 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value026.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value026.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value027.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value027.csproj
index ef89d98..e194c60 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value027.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value027.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value028.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value028.csproj
index 717942d..d8cd982 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value028.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value028.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value029.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value029.csproj
index 07112ee..4695839 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value029.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value029.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value030.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value030.csproj
index e8bb4ef..2f1c401 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value030.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value030.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value031.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value031.csproj
index 6f8c4e0..fc22a08 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value031.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value031.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value032.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value032.csproj
index 2c65900..4ef16b0 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value032.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value032.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value033.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value033.csproj
index 9ebb9d7..10e3f13 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value033.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value033.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value034.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value034.csproj
index 0e1b388..7f31d7a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value034.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value034.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value037.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value037.csproj
index 4d95941..feba500 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value037.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value037.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value038.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value038.csproj
index d29b873..eea4e2d 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value038.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value038.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value039.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value039.csproj
index dc515f1..2780786 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value039.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value039.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value040.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value040.csproj
index 0578ad4..56a759a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value040.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value040.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value041.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value041.csproj
index 0fc5bf9..cc726a8 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value041.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value041.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value042.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value042.csproj
index 53a2555..8149a14 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value042.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value042.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value043.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value043.csproj
index 483bf1e..ffb677a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value043.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value043.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value044.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value044.csproj
index 60a165f..c08000f 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value044.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value044.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value045.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value045.csproj
index fb980c8..000b614 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value045.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/box-unbox/value/box-unbox-value045.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass001.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass001.csproj
index a93bbb5..657362c 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass001.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass001.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass002.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass002.csproj
index a70224c..2a71338 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass002.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass002.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass003.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass003.csproj
index d2cff46..a5ca8b9 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass003.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass003.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass004.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass004.csproj
index 42627fa..e50aa03 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass004.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass004.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass005.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass005.csproj
index 4a2df63..e90b365 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass005.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass005.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass006.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass006.csproj
index d8dedca..8161476 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass006.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass006.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass007.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass007.csproj
index b83d560..866ddaa 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass007.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass007.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass008.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass008.csproj
index 0759844..d0c5e9c 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass008.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass008.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass009.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass009.csproj
index e083c11..276291f 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass009.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass009.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass010.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass010.csproj
index 2cb1537..81c63f0 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass010.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass010.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass011.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass011.csproj
index f1c91fe..1381aca 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass011.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass011.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass012.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass012.csproj
index 24e7772..371be7b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass012.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass012.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass013.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass013.csproj
index 1663865..2bba62e 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass013.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass013.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass014.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass014.csproj
index 11d4680..68ed1bb 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass014.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass014.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass015.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass015.csproj
index fe51f7f..19fb212 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass015.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass015.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass016.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass016.csproj
index 54c1167..116b053 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass016.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass016.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass017.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass017.csproj
index cd899b5..33bafaf 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass017.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass017.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass018.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass018.csproj
index 1b3e3b8..fa52fb1 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass018.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass018.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass019.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass019.csproj
index ad8261a..9e073d06 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass019.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass019.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass020.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass020.csproj
index 3293ca1..21c0050 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass020.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass020.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass021.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass021.csproj
index c1c36e3..822b37c 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass021.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass021.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass022.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass022.csproj
index aece606..c456427 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass022.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass022.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass023.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass023.csproj
index c3e5137..a985e48 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass023.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass023.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass024.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass024.csproj
index 4951715..4fc089f 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass024.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass024.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass025.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass025.csproj
index 868b469..92b918f 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass025.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass025.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass026.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass026.csproj
index 5bb10d6..52f64ca 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass026.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass026.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass027.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass027.csproj
index 53438cdf..99dbf79 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass027.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass027.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass028.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass028.csproj
index f476776..6f6a087 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass028.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass028.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass029.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass029.csproj
index 96a99e4..4233590 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass029.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass029.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass030.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass030.csproj
index f0bba6d..01ec4ba 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass030.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass030.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass031.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass031.csproj
index 2bf7505..567098a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass031.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass031.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass032.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass032.csproj
index fe5561e..df61039 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass032.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass032.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass033.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass033.csproj
index cf67bc0..bcafd9d 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass033.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass033.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass034.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass034.csproj
index 81e5aaf..b1dbc65 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass034.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass034.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass037.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass037.csproj
index 88cf0d2..b4eda41 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass037.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass037.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass038.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass038.csproj
index 861494b..46f47c1 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass038.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass038.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass039.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass039.csproj
index 5fbf17d..2958d34 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass039.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass039.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass040.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass040.csproj
index 11b0df6..f338d86 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass040.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass040.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass041.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass041.csproj
index 300735d..e540a19 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass041.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass041.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass042.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass042.csproj
index 0c052cd..9d55f8b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass042.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass042.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass043.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass043.csproj
index 8cb2ba4..383f30c 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass043.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass043.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass044.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass044.csproj
index 93e0d4c..af60d00 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass044.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass044.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass045.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass045.csproj
index 91e55d8..8fd737a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass045.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/castclass/castclass045.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum001.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum001.csproj
index a113abf..4c87318 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum001.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum001.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum002.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum002.csproj
index 5bf7638..7e4a09d 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum002.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum002.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum003.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum003.csproj
index 8458f5c..0b8f8b9 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum003.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/enum/castclass-enum003.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics001.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics001.csproj
index 06d9656..4a267cc 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics001.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics001.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics002.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics002.csproj
index d3f94fd..2e8eb6a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics002.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics002.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics003.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics003.csproj
index fd0afb1..677bde8 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics003.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics003.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics004.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics004.csproj
index fe15a83..f1ce60c 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics004.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics004.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics005.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics005.csproj
index ccca4ca..86d1f73 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics005.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics005.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics006.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics006.csproj
index 182a64b..947149f 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics006.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics006.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics007.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics007.csproj
index b400dfb..451a09b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics007.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics007.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics008.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics008.csproj
index 25c1c5d..cc0dd4a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics008.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics008.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics009.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics009.csproj
index 90c105a..be22b55 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics009.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics009.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics010.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics010.csproj
index c627a2f..f4587c2 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics010.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics010.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics011.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics011.csproj
index e89d1dc..542a517 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics011.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics011.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics012.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics012.csproj
index c5e8d97..a174262 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics012.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics012.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics013.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics013.csproj
index e56b1b3..396176b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics013.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics013.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics014.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics014.csproj
index 9c972c0..0f452373 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics014.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics014.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics015.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics015.csproj
index 51f7fddb..dd8a195 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics015.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics015.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics016.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics016.csproj
index 1759744..f330135 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics016.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics016.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics017.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics017.csproj
index fcd86f0..33f9977 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics017.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics017.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics018.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics018.csproj
index 3088e6b..f5ff821 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics018.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics018.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics019.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics019.csproj
index bc35160..4fd2ae8 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics019.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics019.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics020.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics020.csproj
index 318a83f..49fc46b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics020.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics020.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics021.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics021.csproj
index 257369d..18c8a11 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics021.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics021.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics022.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics022.csproj
index e2fbd14..843da55 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics022.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics022.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics023.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics023.csproj
index 6b31655..2a41e88 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics023.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics023.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics024.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics024.csproj
index 5d78215..821d197 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics024.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics024.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics025.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics025.csproj
index 0b27810..8a99cc2 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics025.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics025.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics026.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics026.csproj
index 68211f2..c23d55a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics026.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics026.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics027.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics027.csproj
index 89e199a..32b64cd 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics027.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics027.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics028.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics028.csproj
index 95ccd06..745b8f9 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics028.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics028.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics029.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics029.csproj
index 76d58b3..97827e4 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics029.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics029.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics030.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics030.csproj
index aceae57..305cbbe 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics030.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics030.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics031.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics031.csproj
index f99f2a5..3df3f63 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics031.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics031.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics032.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics032.csproj
index 90282e6..26c46c7 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics032.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics032.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics033.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics033.csproj
index 78bb15a..655a9ea 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics033.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics033.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics034.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics034.csproj
index 768c4ca..d706fb5 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics034.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics034.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics037.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics037.csproj
index 65b4c4d..7424d9b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics037.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics037.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics038.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics038.csproj
index a6d2240..199f496 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics038.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics038.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics039.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics039.csproj
index 2907e8d..6a89044 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics039.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics039.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics040.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics040.csproj
index cdd35e9..857138a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics040.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics040.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics041.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics041.csproj
index decbb4d..e26660a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics041.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics041.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics042.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics042.csproj
index a886c7a..6e75968 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics042.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics042.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics043.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics043.csproj
index 4c2aaa4..ac59625 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics043.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics043.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics044.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics044.csproj
index a776a2d..f76bcf9 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics044.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics044.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics045.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics045.csproj
index 754496a..bf682bf 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics045.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/generics/castclass-generics045.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface001.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface001.csproj
index 242ff7b..6595928 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface001.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface001.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface002.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface002.csproj
index a7e062c..273d3a4 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface002.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface002.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface003.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface003.csproj
index c8fda22..bd06389 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface003.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface003.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface004.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface004.csproj
index 1227d0b..a771c91 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface004.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface004.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface005.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface005.csproj
index f080d99..f1257dd 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface005.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface005.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface006.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface006.csproj
index 552923f..1ccd2a9 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface006.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface006.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface007.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface007.csproj
index ce604ab..a9276f4 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface007.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface007.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface008.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface008.csproj
index 064d0a7..f83b644 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface008.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface008.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface009.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface009.csproj
index 370281d..676d3fc 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface009.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface009.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface010.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface010.csproj
index bc5a67a..ab2a1cf 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface010.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface010.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface011.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface011.csproj
index aada157..7b972bf 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface011.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface011.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface012.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface012.csproj
index 170ef8a..cf3bc7c 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface012.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface012.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface013.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface013.csproj
index f85d732..7656fc2 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface013.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface013.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface014.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface014.csproj
index bd0a784..44689df 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface014.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface014.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface015.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface015.csproj
index 8ea846d..64fed3b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface015.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface015.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface016.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface016.csproj
index 9d17acb..6a11e12 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface016.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface016.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface017.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface017.csproj
index 5d0ada6..3cfb7f1 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface017.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface017.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface018.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface018.csproj
index 5f1a225..38d8a9b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface018.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/interface/castclass-interface018.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null001.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null001.csproj
index 70b6c7f..fd0d2ae 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null001.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null001.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null002.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null002.csproj
index 5891fed..47b6606 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null002.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null002.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null003.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null003.csproj
index dc3b239..6a54c4c 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null003.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null003.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null004.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null004.csproj
index ff07c96..d8535b1 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null004.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null004.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null005.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null005.csproj
index 282c585..4296552 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null005.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null005.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null006.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null006.csproj
index 79793b1..5fa5db2 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null006.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null006.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null007.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null007.csproj
index 7a8e9b0..37abca8 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null007.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null007.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null008.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null008.csproj
index af0b25b..7a732ba 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null008.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null008.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null009.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null009.csproj
index abdb216..678325c 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null009.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null009.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null010.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null010.csproj
index cc8fc71..57b3800 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null010.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null010.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null011.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null011.csproj
index 9f10550..6ebdd6e 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null011.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null011.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null012.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null012.csproj
index 1705877..4c39a9e 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null012.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null012.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null013.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null013.csproj
index 0f36b84..4c3ca72 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null013.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null013.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null014.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null014.csproj
index e75aeae..452fce4 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null014.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null014.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null015.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null015.csproj
index 96b4f86..c012f83 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null015.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null015.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null016.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null016.csproj
index 39fc63a..3678866 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null016.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null016.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null017.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null017.csproj
index fd8bb12..cf837ef 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null017.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null017.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null018.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null018.csproj
index 7164510..cafe3d1 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null018.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null018.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null019.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null019.csproj
index c479635..33c205a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null019.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null019.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null020.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null020.csproj
index 1666a85..81df9fd 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null020.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null020.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null021.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null021.csproj
index 8e744d3..5fc0ca8 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null021.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null021.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null022.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null022.csproj
index 3e1bcf8..0773248 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null022.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null022.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null023.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null023.csproj
index 44988a8..d2925f2 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null023.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null023.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null024.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null024.csproj
index c08eaad..67955c2 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null024.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null024.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null025.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null025.csproj
index 82a467c..f9a54f3 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null025.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null025.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null026.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null026.csproj
index 948ed5c..7ef395e 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null026.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null026.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null027.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null027.csproj
index b1be22f..5a16d82 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null027.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null027.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null028.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null028.csproj
index b35872e..77f01f6 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null028.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null028.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null029.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null029.csproj
index 9202082..daf2fa6 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null029.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null029.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null030.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null030.csproj
index 185f98f..c975bad 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null030.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null030.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null031.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null031.csproj
index e45b344..9d9561c 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null031.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null031.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null032.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null032.csproj
index 8fbebc0..1273814 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null032.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null032.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null033.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null033.csproj
index 651d8ff..584a4fb 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null033.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null033.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null034.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null034.csproj
index 6211e99..79428fc 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null034.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null034.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null037.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null037.csproj
index ed734c9..e7ff577 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null037.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null037.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null038.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null038.csproj
index d80fb9f..5b005a0 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null038.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null038.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null039.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null039.csproj
index e7e9b5c..67c757a 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null039.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null039.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null040.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null040.csproj
index e0ba21f..d910c08 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null040.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null040.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null041.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null041.csproj
index cc519b9..078cc0b 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null041.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null041.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null042.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null042.csproj
index 0376dbf..e661f83 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null042.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null042.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null043.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null043.csproj
index b6e9f93..847e1be 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null043.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null043.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null044.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null044.csproj
index c9d8f4e..1af5bd1 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null044.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null044.csproj
@@ -35,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/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null045.csproj b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null045.csproj
index 0c78828..12937d5 100644
--- a/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null045.csproj
+++ b/src/coreclr/tests/src/JIT/jit64/valuetypes/nullable/castclass/null/castclass-null045.csproj
@@ -35,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/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ArrBoundUnsigned.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ArrBoundUnsigned.csproj
index 5c3f2d4..ad6d46a 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ArrBoundUnsigned.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ArrBoundUnsigned.csproj
@@ -40,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/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ConstantProp.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ConstantProp.csproj
index b5f4312..2f98dc5 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ConstantProp.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/ConstantProp.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/AssertionPropagation/CopyProp.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/CopyProp.csproj
index a15f0cc..38e778e 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/CopyProp.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/CopyProp.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion1.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion1.csproj
index e977f3e..7943ec8 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion1.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion1.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion2.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion2.csproj
index 5ad2bf8..8f3a6e2 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion2.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion2.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion3.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion3.csproj
index 2a0a1de..5bb2736 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion3.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion3.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion4.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion4.csproj
index 2b83833..537bea2 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion4.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion4.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion5.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion5.csproj
index 090f2cf..24f4ade 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion5.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion5.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion6.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion6.csproj
index a54a5d4..f4eebe3 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion6.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion6.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion7.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion7.csproj
index df54ebc..7dd3e67 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion7.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/NullCheckAssertion7.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/AssertionPropagation/TypeOfAssertion.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/TypeOfAssertion.csproj
index 1e9741d..28c4f64 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/TypeOfAssertion.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/TypeOfAssertion.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/AssertionPropagation/regression/dev10/bug573840/bug573840.csproj b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/regression/dev10/bug573840/bug573840.csproj
index 2d16974..673b36f 100644
--- a/src/coreclr/tests/src/JIT/opt/AssertionPropagation/regression/dev10/bug573840/bug573840.csproj
+++ b/src/coreclr/tests/src/JIT/opt/AssertionPropagation/regression/dev10/bug573840/bug573840.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,10 +40,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/src/coreclr/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj b/src/coreclr/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj
index b1e2ecf..3c622ee 100644
--- a/src/coreclr/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj
+++ b/src/coreclr/tests/src/JIT/opt/Devirtualization/GitHub_9945_2.ilproj
@@ -37,6 +37,10 @@
   <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> 
diff --git a/src/coreclr/tests/src/JIT/opt/Devirtualization/enum.csproj b/src/coreclr/tests/src/JIT/opt/Devirtualization/enum.csproj
index 59c9791..1f28e35 100644
--- a/src/coreclr/tests/src/JIT/opt/Devirtualization/enum.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Devirtualization/enum.csproj
@@ -35,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/src/coreclr/tests/src/JIT/opt/Devirtualization/exacttype.csproj b/src/coreclr/tests/src/JIT/opt/Devirtualization/exacttype.csproj
index 243e003..8fd6d76 100644
--- a/src/coreclr/tests/src/JIT/opt/Devirtualization/exacttype.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Devirtualization/exacttype.csproj
@@ -35,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/src/coreclr/tests/src/JIT/opt/Devirtualization/fromcollection.csproj b/src/coreclr/tests/src/JIT/opt/Devirtualization/fromcollection.csproj
index 9e23ae8..a02174b 100644
--- a/src/coreclr/tests/src/JIT/opt/Devirtualization/fromcollection.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Devirtualization/fromcollection.csproj
@@ -35,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/src/coreclr/tests/src/JIT/opt/Devirtualization/inlinedevirt.csproj b/src/coreclr/tests/src/JIT/opt/Devirtualization/inlinedevirt.csproj
index 5faffa9..18f94de 100644
--- a/src/coreclr/tests/src/JIT/opt/Devirtualization/inlinedevirt.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Devirtualization/inlinedevirt.csproj
@@ -35,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/src/coreclr/tests/src/JIT/opt/Devirtualization/sealedclass.csproj b/src/coreclr/tests/src/JIT/opt/Devirtualization/sealedclass.csproj
index 7f0d4a0..cd30958 100644
--- a/src/coreclr/tests/src/JIT/opt/Devirtualization/sealedclass.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Devirtualization/sealedclass.csproj
@@ -35,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/src/coreclr/tests/src/JIT/opt/Devirtualization/sealeddefault.csproj b/src/coreclr/tests/src/JIT/opt/Devirtualization/sealeddefault.csproj
index b492db1..bded6c5 100644
--- a/src/coreclr/tests/src/JIT/opt/Devirtualization/sealeddefault.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Devirtualization/sealeddefault.csproj
@@ -35,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/src/coreclr/tests/src/JIT/opt/Devirtualization/sealedmethod.csproj b/src/coreclr/tests/src/JIT/opt/Devirtualization/sealedmethod.csproj
index b4c421b..421cc63 100644
--- a/src/coreclr/tests/src/JIT/opt/Devirtualization/sealedmethod.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Devirtualization/sealedmethod.csproj
@@ -35,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/src/coreclr/tests/src/JIT/opt/Devirtualization/sharedoverride.csproj b/src/coreclr/tests/src/JIT/opt/Devirtualization/sharedoverride.csproj
index 3fa7208..6095d4f 100644
--- a/src/coreclr/tests/src/JIT/opt/Devirtualization/sharedoverride.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Devirtualization/sharedoverride.csproj
@@ -35,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/src/coreclr/tests/src/JIT/opt/Inline/regression/bug584219/inliningVars.csproj b/src/coreclr/tests/src/JIT/opt/Inline/regression/bug584219/inliningVars.csproj
index 172a729d..1ecdfe5 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/regression/bug584219/inliningVars.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/regression/bug584219/inliningVars.csproj
@@ -34,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/src/coreclr/tests/src/JIT/opt/Inline/regression/bug595776/bug595776.csproj b/src/coreclr/tests/src/JIT/opt/Inline/regression/bug595776/bug595776.csproj
index 7899688..04b03fd 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/regression/bug595776/bug595776.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/regression/bug595776/bug595776.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/Inline/regression/mismatch32/mismatch32.ilproj b/src/coreclr/tests/src/JIT/opt/Inline/regression/mismatch32/mismatch32.ilproj
index 089871e..b6d6586 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/regression/mismatch32/mismatch32.ilproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/regression/mismatch32/mismatch32.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/opt/Inline/regression/mismatch64/mismatch64.ilproj b/src/coreclr/tests/src/JIT/opt/Inline/regression/mismatch64/mismatch64.ilproj
index 35c0a74..a01b6ec 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/regression/mismatch64/mismatch64.ilproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/regression/mismatch64/mismatch64.ilproj
@@ -35,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/src/coreclr/tests/src/JIT/opt/Inline/tests/ArrayOfStructs.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/ArrayOfStructs.csproj
index 3ea9fd9..8ad617f 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/ArrayOfStructs.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/ArrayOfStructs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegInstanceFtn.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegInstanceFtn.csproj
index f9815c0..bcd066b 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegInstanceFtn.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegInstanceFtn.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegStaticFtn.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegStaticFtn.csproj
index a3ec49d..b9ba12f 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegStaticFtn.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/DelegStaticFtn.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/GenericStructs.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/GenericStructs.csproj
index c517d00..969c1d4 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/GenericStructs.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/GenericStructs.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline.csproj
index aa7ff44..2f26cf2 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/InlineThrow.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/InlineThrow.csproj
index fa9f4f8..725845a 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/InlineThrow.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/InlineThrow.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_DelegateStruct.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_DelegateStruct.csproj
index b5b1eb6..f04f920 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_DelegateStruct.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_DelegateStruct.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_GenericMethods.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_GenericMethods.csproj
index fb5b0e8..d75fa97 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_GenericMethods.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_GenericMethods.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Many.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Many.csproj
index 8e0b348..0da44ec 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Many.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Many.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_MultipleReturn.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_MultipleReturn.csproj
index a2365b5..a4606d9 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_MultipleReturn.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_MultipleReturn.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NewObj.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NewObj.csproj
index 5d1a240..227fb8e 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NewObj.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NewObj.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NormalizeStack.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NormalizeStack.csproj
index 89e11d0..35b79d1 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NormalizeStack.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_NormalizeStack.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Recursion.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Recursion.csproj
index c4ea707..035e5a5 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Recursion.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Recursion.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod.csproj
index 43a3ec9..8e2b0fd 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod21.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod21.csproj
index c2b6e8e..1575b78 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod21.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_RecursiveMethod21.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_STARG.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_STARG.csproj
index 5b440d1..97a6f60 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_STARG.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_STARG.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_SideAffects.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_SideAffects.csproj
index 9601467..3eab7d4 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_SideAffects.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_SideAffects.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Vars.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Vars.csproj
index a2523cc..438b274 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Vars.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_Vars.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_handler.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_handler.csproj
index 08580c5..9385b66 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_handler.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/Inline_handler.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/LotsOfInlines.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/LotsOfInlines.csproj
index 9c97450..227a7a9 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/LotsOfInlines.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/LotsOfInlines.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/ReturnStruct_Method.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/ReturnStruct_Method.csproj
index 805da9a..07f46ca 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/ReturnStruct_Method.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/ReturnStruct_Method.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/StructAsParam_Method.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/StructAsParam_Method.csproj
index d910ad4..da8bc7f 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/StructAsParam_Method.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/StructAsParam_Method.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/StructInClass.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/StructInClass.csproj
index 8a24eeb..3f37d18 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/StructInClass.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/StructInClass.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/Inline/tests/UnsafeBlockCopy.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/UnsafeBlockCopy.csproj
index 5a3c37a..ad51218 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/UnsafeBlockCopy.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/UnsafeBlockCopy.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,10 +40,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/src/coreclr/tests/src/JIT/opt/Inline/tests/args1.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/args1.csproj
index 56b374d..2f77e52 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/args1.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/args1.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/args2.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/args2.csproj
index 96d530e..93776ba 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/args2.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/args2.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/args3.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/args3.csproj
index 920ebab..1fddbcc 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/args3.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/args3.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/Inline/tests/array.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/array.csproj
index d6a5aec..fd07feb 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/array.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/array.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/debug.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/debug.csproj
index 4687dcc..5226065 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/debug.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/debug.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/deepcall.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/deepcall.csproj
index 12fd554..bf9568c 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/deepcall.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/deepcall.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/fact.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/fact.csproj
index 0b5ba92..3d8d0b2 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/fact.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/fact.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -34,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/src/coreclr/tests/src/JIT/opt/Inline/tests/ifelse.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/ifelse.csproj
index dae420f..8185f6e 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/ifelse.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/ifelse.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/indexer.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/indexer.csproj
index 3f1b15c..33f4388 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/indexer.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/indexer.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceCall.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceCall.csproj
index f9b7577..e20d913 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceCall.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceCall.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceproperty.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceproperty.csproj
index 408ad4e..4dbc30f 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceproperty.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/interfaceproperty.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/mathfunc.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/mathfunc.csproj
index 74244e6..4b11455 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/mathfunc.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/mathfunc.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/mthdimpl.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/mthdimpl.csproj
index 1eb38c7..e01f5bb 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/mthdimpl.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/mthdimpl.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/property.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/property.csproj
index 67edcbe..e6fe24e 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/property.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/property.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/size.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/size.csproj
index 59587e4..4203fa1 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/size.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/size.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/Inline/tests/struct_opcodes.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/struct_opcodes.csproj
index c49a35a..1afcbcd 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/struct_opcodes.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/struct_opcodes.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/Inline/tests/throwtest.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/throwtest.csproj
index ce8af1b..1d7d1e1 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/throwtest.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/throwtest.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/Inline/tests/trycatch.csproj b/src/coreclr/tests/src/JIT/opt/Inline/tests/trycatch.csproj
index 8460101..99c41b3 100644
--- a/src/coreclr/tests/src/JIT/opt/Inline/tests/trycatch.csproj
+++ b/src/coreclr/tests/src/JIT/opt/Inline/tests/trycatch.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -39,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/src/coreclr/tests/src/JIT/opt/perf/doublealign/Arrays.csproj b/src/coreclr/tests/src/JIT/opt/perf/doublealign/Arrays.csproj
index a7017b0..94f948b 100644
--- a/src/coreclr/tests/src/JIT/opt/perf/doublealign/Arrays.csproj
+++ b/src/coreclr/tests/src/JIT/opt/perf/doublealign/Arrays.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -41,10 +41,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/opt/perf/doublealign/Locals.csproj b/src/coreclr/tests/src/JIT/opt/perf/doublealign/Locals.csproj
index 0e8ec06..d9c3227 100644
--- a/src/coreclr/tests/src/JIT/opt/perf/doublealign/Locals.csproj
+++ b/src/coreclr/tests/src/JIT/opt/perf/doublealign/Locals.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
     <IlasmRoundTrip>true</IlasmRoundTrip>
@@ -43,10 +43,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/opt/perf/doublealign/objects.csproj b/src/coreclr/tests/src/JIT/opt/perf/doublealign/objects.csproj
index 5ec4226..acb32e7 100644
--- a/src/coreclr/tests/src/JIT/opt/perf/doublealign/objects.csproj
+++ b/src/coreclr/tests/src/JIT/opt/perf/doublealign/objects.csproj
@@ -36,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj
index 7793674..6b5a202 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
 
@@ -44,10 +44,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_do.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_do.csproj
index fac2a73..083e327 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj
index 6a67329..4dc0a76 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
 
@@ -44,10 +44,6 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <PropertyGroup>
-    <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
-    <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
-  </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
   <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
   </PropertyGroup> 
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_ro.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_ro.csproj
index f5bb613..732e49c 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/bigvtbl/bigvtbl_cs_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived1.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived1.csproj
index a2017a9..5b74deb 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived1.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived1.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived10.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived10.csproj
index b4e7f6b..2e6573d 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived10.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived10.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived11.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived11.csproj
index 7a1961a..8f96fd0 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived11.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived11.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived12.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived12.csproj
index 3b88447..5afdf09 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived12.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived12.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived13.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived13.csproj
index 0219074..a2a35fa 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived13.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived13.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived14.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived14.csproj
index a592621..b3da7d0 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived14.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived14.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived15.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived15.csproj
index 6594357..c39c19d 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived15.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived15.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived16.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived16.csproj
index 79b5103..fa89d7e 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived16.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived16.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived17.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived17.csproj
index 9070456..6cbe73b 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived17.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived17.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived18.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived18.csproj
index ce53895..913c0e5 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived18.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived18.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived19.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived19.csproj
index f51197c..ba70340 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived19.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived19.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived2.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived2.csproj
index 0f437b8..418fe02 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived2.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived2.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived20.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived20.csproj
index e1fa38b..91ba0ee 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived20.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived20.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived3.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived3.csproj
index 410ca48..93234a7 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived3.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived3.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived4.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived4.csproj
index 8b61ae4..8d60474 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived4.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived4.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived5.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived5.csproj
index 703362d..e556aa2 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived5.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived5.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived6.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived6.csproj
index d5f5497..5099c5e 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived6.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived6.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived7.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived7.csproj
index 0fba852..68980ea 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived7.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived7.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived8.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived8.csproj
index 7e82fc2..8c47f9c 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived8.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived8.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived9.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived9.csproj
index 1256146..513cb34 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived9.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/cderived9.csproj
@@ -37,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_d.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_d.csproj
index b345ab2..05dd1af 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_d.csproj
@@ -58,10 +58,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_do.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_do.csproj
index 7c97779..079e764 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_do.csproj
@@ -58,10 +58,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_r.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_r.csproj
index c529a3a..f87e1fe 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_r.csproj
@@ -58,10 +58,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_ro.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_ro.csproj
index a2fcc9f..55ab3d0 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/hashcode/ctest1_cs_ro.csproj
@@ -58,10 +58,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_d.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_d.csproj
index c768b46..f28e21c 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_d.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="itest1.csproj" />
     <ProjectReference Include="itest2.csproj" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_do.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_do.csproj
index a526dc0..286d473 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_do.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="itest1.csproj" />
     <ProjectReference Include="itest2.csproj" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_r.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_r.csproj
index 72159ea..933831a 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_r.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="itest1.csproj" />
     <ProjectReference Include="itest2.csproj" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_ro.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_ro.csproj
index 0ebd7db..5e56a7c 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/ctest_cs_ro.csproj
@@ -35,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>
   <ItemGroup>
     <ProjectReference Include="itest1.csproj" />
     <ProjectReference Include="itest2.csproj" />
diff --git a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest1.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest1.csproj
index 03333a3..4df09c1 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest1.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest1.csproj
@@ -36,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest10.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest10.csproj
index ac621b6..36a2e88 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest10.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest10.csproj
@@ -36,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest2.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest2.csproj
index e8e1949..317e6de 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest2.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest2.csproj
@@ -36,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest3.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest3.csproj
index b672822..70e8098 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest3.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest3.csproj
@@ -36,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest4.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest4.csproj
index aeabf4e..02a4c44 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest4.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest4.csproj
@@ -36,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest5.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest5.csproj
index ee466b3..0170773 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest5.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest5.csproj
@@ -36,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest6.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest6.csproj
index d86e86b..9eee563 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest6.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest6.csproj
@@ -36,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest7.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest7.csproj
index a3499dd..0e1fcad 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest7.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest7.csproj
@@ -36,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest8.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest8.csproj
index 0ed0b92..b7e08f6 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest8.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest8.csproj
@@ -36,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest9.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest9.csproj
index 0e13df0..8573b47 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest9.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/manyintf/itest9.csproj
@@ -36,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_d.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_d.csproj
index c5283d5..8092654 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_d.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_d.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_do.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_do.csproj
index 1cbf8bb..1b67754 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_do.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_do.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_r.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_r.csproj
index 207c3a2..3b4e772 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_r.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_r.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_ro.csproj b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_ro.csproj
index c87fa10..1aaa067 100644
--- a/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_ro.csproj
+++ b/src/coreclr/tests/src/JIT/opt/virtualstubdispatch/mixed/mixed_cs_ro.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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
@@ -40,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/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj b/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj
index 4769414..d3e3c34 100644
--- a/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj
+++ b/src/coreclr/tests/src/JIT/superpmi/superpmicollect.csproj
@@ -42,10 +42,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/src/coreclr/tests/src/TestWrappersConfig/project.json b/src/coreclr/tests/src/TestWrappersConfig/project.json
index 58e6014..1dbeaa8 100644
--- a/src/coreclr/tests/src/TestWrappersConfig/project.json
+++ b/src/coreclr/tests/src/TestWrappersConfig/project.json
@@ -29,4 +29,4 @@
     "debian.8-x64": {},
     "fedora.23-x64": {}
   }
-}
+}
\ No newline at end of file
diff --git a/src/coreclr/tests/src/baseservices/varargs/varargsupport.ilproj b/src/coreclr/tests/src/baseservices/varargs/varargsupport.ilproj
index 1f207ac..9d22131 100644
--- a/src/coreclr/tests/src/baseservices/varargs/varargsupport.ilproj
+++ b/src/coreclr/tests/src/baseservices/varargs/varargsupport.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/baseservices/varargs/varargsupport_r.ilproj b/src/coreclr/tests/src/baseservices/varargs/varargsupport_r.ilproj
index 39e0681..9b724ef 100644
--- a/src/coreclr/tests/src/baseservices/varargs/varargsupport_r.ilproj
+++ b/src/coreclr/tests/src/baseservices/varargs/varargsupport_r.ilproj
@@ -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	.0\UITestExtensionPackages</ReferencePath>
+    <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
     <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
   </PropertyGroup>
diff --git a/src/coreclr/tests/src/dir.props b/src/coreclr/tests/src/dir.props
index 2fb2e19..e0899ff 100644
--- a/src/coreclr/tests/src/dir.props
+++ b/src/coreclr/tests/src/dir.props
@@ -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/src/coreclr/tests/src/dir.targets b/src/coreclr/tests/src/dir.targets
index 64b5666..2cc051d 100644
--- a/src/coreclr/tests/src/dir.targets
+++ b/src/coreclr/tests/src/dir.targets
@@ -173,4 +173,15 @@
     </ItemGroup>
   </Target>
 
+  <Target Name="UpdateReferenceItems"
+          BeforeTargets="BeforeResolveReferences"
+  >
+    <ItemGroup>
+      <Reference Include="$(TargetingPackPath)/*.dll" >
+        <Private>false</Private>
+      </Reference>
+    </ItemGroup>
+
+  </Target>
+
 </Project>
diff --git a/src/coreclr/tests/src/dirs.proj b/src/coreclr/tests/src/dirs.proj
index 5314c27..e49ab94 100644
--- a/src/coreclr/tests/src/dirs.proj
+++ b/src/coreclr/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/src/coreclr/tests/src/jit/opt/Devirtualization/GitHub_9945.csproj b/src/coreclr/tests/src/jit/opt/Devirtualization/GitHub_9945.csproj
index 6646c68..7a750d3 100644
--- a/src/coreclr/tests/src/jit/opt/Devirtualization/GitHub_9945.csproj
+++ b/src/coreclr/tests/src/jit/opt/Devirtualization/GitHub_9945.csproj
@@ -35,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/src/coreclr/tests/src/performance/project.json b/src/coreclr/tests/src/performance/project.json
index 04a7674..dfc5f2f 100644
--- a/src/coreclr/tests/src/performance/project.json
+++ b/src/coreclr/tests/src/performance/project.json
@@ -36,4 +36,4 @@
       ]
     }
   }
-}
+}
\ No newline at end of file