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/Coverage | |
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/Coverage')
-rw-r--r-- | tests/src/JIT/Methodical/Coverage/b39946.ilproj | 2 | ||||
-rw-r--r-- | tests/src/JIT/Methodical/Coverage/b433189.csproj | 7 | ||||
-rw-r--r-- | tests/src/JIT/Methodical/Coverage/b518440.ilproj | 2 | ||||
-rw-r--r-- | tests/src/JIT/Methodical/Coverage/hole.ilproj | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/tests/src/JIT/Methodical/Coverage/b39946.ilproj b/tests/src/JIT/Methodical/Coverage/b39946.ilproj index 498e66a62a..4ec8a2b7ec 100644 --- a/tests/src/JIT/Methodical/Coverage/b39946.ilproj +++ b/tests/src/JIT/Methodical/Coverage/b39946.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="b39946.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/Coverage/b433189.csproj b/tests/src/JIT/Methodical/Coverage/b433189.csproj index 5811987fb4..c95dc8456e 100644 --- a/tests/src/JIT/Methodical/Coverage/b433189.csproj +++ b/tests/src/JIT/Methodical/Coverage/b433189.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="b433189.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/Coverage/b518440.ilproj b/tests/src/JIT/Methodical/Coverage/b518440.ilproj index 18f52af06d..62024cd5aa 100644 --- a/tests/src/JIT/Methodical/Coverage/b518440.ilproj +++ b/tests/src/JIT/Methodical/Coverage/b518440.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="b518440.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/Coverage/hole.ilproj b/tests/src/JIT/Methodical/Coverage/hole.ilproj index 71a7cba3bf..1683693710 100644 --- a/tests/src/JIT/Methodical/Coverage/hole.ilproj +++ b/tests/src/JIT/Methodical/Coverage/hole.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="hole.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> |