summaryrefslogtreecommitdiff
path: root/tests/src/JIT/Methodical/xxobj/operand
diff options
context:
space:
mode:
authorMatt Mitchell <mmitche@microsoft.com>2015-07-06 16:12:43 -0700
committerMatt Mitchell <mmitche@microsoft.com>2015-07-09 16:20:11 -0700
commit1972ec27c9a570460dde377ff910325b0017507b (patch)
tree7c3aa8f49005bfaa5c6a8742427783aac778e195 /tests/src/JIT/Methodical/xxobj/operand
parenteed62e377af693f0288587a3600c89e258e614a6 (diff)
downloadcoreclr-1972ec27c9a570460dde377ff910325b0017507b.tar.gz
coreclr-1972ec27c9a570460dde377ff910325b0017507b.tar.bz2
coreclr-1972ec27c9a570460dde377ff910325b0017507b.zip
Move CoreCLR to the modern build tools and dnx
This changes moves coreclr onto DNX (same version as corefx). Theoretically, this should allow these tests to target the desktop CLR. All of the old package.config files are gone and replaced with corresponding project.json files. The up front restore behavior is retained. Tests are now buildable individually, though not runnable in a similar fashion.
Diffstat (limited to 'tests/src/JIT/Methodical/xxobj/operand')
-rw-r--r--tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj7
-rw-r--r--tests/src/JIT/Methodical/xxobj/operand/_il_dbgconst.ilproj2
-rw-r--r--tests/src/JIT/Methodical/xxobj/operand/_il_dbgldelema.ilproj2
-rw-r--r--tests/src/JIT/Methodical/xxobj/operand/_il_dbgmdarray.ilproj2
-rw-r--r--tests/src/JIT/Methodical/xxobj/operand/_il_dbgrefanyval.ilproj2
-rw-r--r--tests/src/JIT/Methodical/xxobj/operand/_il_dbgunbox.ilproj2
-rw-r--r--tests/src/JIT/Methodical/xxobj/operand/_il_relconst.ilproj2
-rw-r--r--tests/src/JIT/Methodical/xxobj/operand/_il_relldelema.ilproj2
-rw-r--r--tests/src/JIT/Methodical/xxobj/operand/_il_relmdarray.ilproj2
-rw-r--r--tests/src/JIT/Methodical/xxobj/operand/_il_relrefanyval.ilproj2
-rw-r--r--tests/src/JIT/Methodical/xxobj/operand/_il_relunbox.ilproj2
-rw-r--r--tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj7
-rw-r--r--tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj7
-rw-r--r--tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj7
-rw-r--r--tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj7
15 files changed, 20 insertions, 35 deletions
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj b/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj
index 13c6675b3d..127c9d46de 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_dbgunbox.csproj
@@ -13,7 +13,7 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
+
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
<Compile Include="unbox.cs" />
</ItemGroup>
<ItemGroup>
- <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+ <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<PropertyGroup>
- <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+ <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+ <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
</PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgconst.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgconst.ilproj
index 0bc5ca012e..d787fb56b6 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgconst.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgconst.ilproj
@@ -13,7 +13,6 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
<Compile Include="const.il" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgldelema.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgldelema.ilproj
index 791751a0fd..f1249a6bb3 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgldelema.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgldelema.ilproj
@@ -13,7 +13,6 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
<Compile Include="ldelema.il" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgmdarray.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgmdarray.ilproj
index 1bb2be112c..b46116cd33 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgmdarray.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgmdarray.ilproj
@@ -13,7 +13,6 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
<Compile Include="mdarray.il" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgrefanyval.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgrefanyval.ilproj
index c944a3c84a..8291169e82 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgrefanyval.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgrefanyval.ilproj
@@ -13,7 +13,6 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
<Compile Include="refanyval.il" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgunbox.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgunbox.ilproj
index 81883e47f8..f150dcdd3a 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_dbgunbox.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_dbgunbox.ilproj
@@ -13,7 +13,6 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
<Compile Include="unbox.il" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_relconst.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_relconst.ilproj
index 37e71d52c7..86c881602b 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_relconst.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_relconst.ilproj
@@ -13,7 +13,6 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
<Compile Include="const.il" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_relldelema.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_relldelema.ilproj
index dd5e96b003..58e645bc94 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_relldelema.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_relldelema.ilproj
@@ -13,7 +13,6 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
<Compile Include="ldelema.il" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_relmdarray.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_relmdarray.ilproj
index b4d897109f..b43d7427ac 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_relmdarray.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_relmdarray.ilproj
@@ -13,7 +13,6 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
<Compile Include="mdarray.il" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_relrefanyval.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_relrefanyval.ilproj
index 98b9ebd06e..ea1c7e5a82 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_relrefanyval.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_relrefanyval.ilproj
@@ -13,7 +13,6 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
<Compile Include="refanyval.il" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_il_relunbox.ilproj b/tests/src/JIT/Methodical/xxobj/operand/_il_relunbox.ilproj
index b72339e44e..a5cfd3b786 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_il_relunbox.ilproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_il_relunbox.ilproj
@@ -13,7 +13,6 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
@@ -33,7 +32,6 @@
<Compile Include="unbox.il" />
</ItemGroup>
<ItemGroup>
- <None Include="packages.config" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj b/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj
index 13c6675b3d..127c9d46de 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_relunbox.csproj
@@ -13,7 +13,7 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
+
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
<Compile Include="unbox.cs" />
</ItemGroup>
<ItemGroup>
- <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+ <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<PropertyGroup>
- <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+ <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+ <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
</PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj
index 1ed6e8fdef..26733e5387 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_speed_dbgunbox.csproj
@@ -13,7 +13,7 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
+
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
<Compile Include="unbox.cs" />
</ItemGroup>
<ItemGroup>
- <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+ <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<PropertyGroup>
- <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+ <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+ <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
</PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj b/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj
index 1ed6e8fdef..26733e5387 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/_speed_relunbox.csproj
@@ -13,7 +13,7 @@
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
- <RestorePackages>true</RestorePackages>
+
<NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
@@ -34,14 +34,15 @@
<Compile Include="unbox.cs" />
</ItemGroup>
<ItemGroup>
- <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+ <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<PropertyGroup>
- <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+ <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+ <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
</PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">
diff --git a/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj b/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj
index 93943d0c93..c249eb881c 100644
--- a/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj
+++ b/tests/src/JIT/Methodical/xxobj/operand/refanyval.csproj
@@ -14,7 +14,7 @@
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<ResolveNuGetPackages>false</ResolveNuGetPackages>
- <LinkLocalMscorlib>true</LinkLocalMscorlib>
+ <ReferenceLocalMscorlib>true</ReferenceLocalMscorlib>
</PropertyGroup>
<!-- Default configurations to help VS understand the configurations -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -34,14 +34,15 @@
<Compile Include="refanyval.cs" />
</ItemGroup>
<ItemGroup>
- <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" />
+ <None Include="$(JitPackagesConfigFileDirectory)minimal\project.json" />
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<PropertyGroup>
- <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile>
+ <ProjectJson>$(JitPackagesConfigFileDirectory)minimal\project.json</ProjectJson>
+ <ProjectLockJson>$(JitPackagesConfigFileDirectory)minimal\project.lock.json</ProjectLockJson>
</PropertyGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
<PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' ">