diff options
| author | Matt Mitchell <mmitche@microsoft.com> | 2015-07-06 16:12:43 -0700 |
|---|---|---|
| committer | Matt Mitchell <mmitche@microsoft.com> | 2015-07-09 16:20:11 -0700 |
| commit | 1972ec27c9a570460dde377ff910325b0017507b (patch) | |
| tree | 7c3aa8f49005bfaa5c6a8742427783aac778e195 /tests/src/JIT/Methodical/nonvirtualcall | |
| parent | eed62e377af693f0288587a3600c89e258e614a6 (diff) | |
| download | coreclr-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/nonvirtualcall')
12 files changed, 24 insertions, 30 deletions
diff --git a/tests/src/JIT/Methodical/nonvirtualcall/classic.csproj b/tests/src/JIT/Methodical/nonvirtualcall/classic.csproj index 9b5be211be..8bbfa05f2e 100644 --- a/tests/src/JIT/Methodical/nonvirtualcall/classic.csproj +++ b/tests/src/JIT/Methodical/nonvirtualcall/classic.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="classic.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/nonvirtualcall/delegate.csproj b/tests/src/JIT/Methodical/nonvirtualcall/delegate.csproj index db4c3e340a..435d0aaab2 100644 --- a/tests/src/JIT/Methodical/nonvirtualcall/delegate.csproj +++ b/tests/src/JIT/Methodical/nonvirtualcall/delegate.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="delegate.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/nonvirtualcall/generics.csproj b/tests/src/JIT/Methodical/nonvirtualcall/generics.csproj index a7f53b4231..f0db1be5be 100644 --- a/tests/src/JIT/Methodical/nonvirtualcall/generics.csproj +++ b/tests/src/JIT/Methodical/nonvirtualcall/generics.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="generics.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/nonvirtualcall/generics2.csproj b/tests/src/JIT/Methodical/nonvirtualcall/generics2.csproj index d70ad025d7..9d9a1446ba 100644 --- a/tests/src/JIT/Methodical/nonvirtualcall/generics2.csproj +++ b/tests/src/JIT/Methodical/nonvirtualcall/generics2.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="generics2.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/nonvirtualcall/generics2_d.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/generics2_d.ilproj index 0400f7c41c..e7dab02fea 100644 --- a/tests/src/JIT/Methodical/nonvirtualcall/generics2_d.ilproj +++ b/tests/src/JIT/Methodical/nonvirtualcall/generics2_d.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="generics2.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/nonvirtualcall/generics2_r.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/generics2_r.ilproj index c4c281806e..7eebf2441f 100644 --- a/tests/src/JIT/Methodical/nonvirtualcall/generics2_r.ilproj +++ b/tests/src/JIT/Methodical/nonvirtualcall/generics2_r.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 --> @@ -34,7 +33,6 @@ <Compile Include="generics2.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/nonvirtualcall/tailcall.csproj b/tests/src/JIT/Methodical/nonvirtualcall/tailcall.csproj index ece15e6bed..4ce54af124 100644 --- a/tests/src/JIT/Methodical/nonvirtualcall/tailcall.csproj +++ b/tests/src/JIT/Methodical/nonvirtualcall/tailcall.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="tailcall.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/nonvirtualcall/tailcall_d.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/tailcall_d.ilproj index 5fa46e83b3..93082eebad 100644 --- a/tests/src/JIT/Methodical/nonvirtualcall/tailcall_d.ilproj +++ b/tests/src/JIT/Methodical/nonvirtualcall/tailcall_d.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="tailcall.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/nonvirtualcall/tailcall_r.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/tailcall_r.ilproj index aae57d0b5e..3d8205639d 100644 --- a/tests/src/JIT/Methodical/nonvirtualcall/tailcall_r.ilproj +++ b/tests/src/JIT/Methodical/nonvirtualcall/tailcall_r.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 --> @@ -34,7 +33,6 @@ <Compile Include="tailcall.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/nonvirtualcall/valuetype.csproj b/tests/src/JIT/Methodical/nonvirtualcall/valuetype.csproj index 32d53f502e..00072f1e6e 100644 --- a/tests/src/JIT/Methodical/nonvirtualcall/valuetype.csproj +++ b/tests/src/JIT/Methodical/nonvirtualcall/valuetype.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="valuetype.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/nonvirtualcall/valuetype_d.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/valuetype_d.ilproj index 54b50892c2..513f81e97c 100644 --- a/tests/src/JIT/Methodical/nonvirtualcall/valuetype_d.ilproj +++ b/tests/src/JIT/Methodical/nonvirtualcall/valuetype_d.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="valuetype.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj b/tests/src/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj index 98cd2ad788..92c94a5ee8 100644 --- a/tests/src/JIT/Methodical/nonvirtualcall/valuetype_r.ilproj +++ b/tests/src/JIT/Methodical/nonvirtualcall/valuetype_r.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 --> @@ -34,7 +33,6 @@ <Compile Include="valuetype.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> |