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/Regression/Dev11 | |
| 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/Regression/Dev11')
19 files changed, 36 insertions, 47 deletions
diff --git a/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj b/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj index ec44d17f64..232054da86 100644 --- a/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.csproj +++ b/tests/src/JIT/Regression/Dev11/Dev11_457559/Dev11_457559.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="Dev11_457559.cs" /> </ItemGroup> <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <PropertyGroup> - <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson> + <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Plain.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Plain.ilproj index d683407de1..4ca3efdac7 100644 --- a/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Plain.ilproj +++ b/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Plain.ilproj @@ -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="Test_HndIndex_10_Plain.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.ilproj index 1737681186..7e9b1d35d2 100644 --- a/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.ilproj +++ b/tests/src/JIT/Regression/Dev11/Dev11_468598/Test_HndIndex_10_Reordered.ilproj @@ -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="Test_HndIndex_10_Reordered.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj b/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj index d589f08404..489d743dd7 100644 --- a/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.csproj +++ b/tests/src/JIT/Regression/Dev11/Dev11_5437/Dev11_5437.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="Dev11_5437.cs" /> </ItemGroup> <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <PropertyGroup> - <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson> + <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj b/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj index bc57d87966..e2096224ff 100644 --- a/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.csproj +++ b/tests/src/JIT/Regression/Dev11/Dev11_617302/Dev11_617302.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="Dev11_617302.cs" /> </ItemGroup> <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <PropertyGroup> - <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson> + <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj b/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj index ea0a8c472b..48c9e359da 100644 --- a/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.csproj +++ b/tests/src/JIT/Regression/Dev11/Dev11_646049/Dev11_646049.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="Dev11_646049.cs" /> </ItemGroup> <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <PropertyGroup> - <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson> + <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131.ilproj index 10016e2190..fd476734e6 100644 --- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131.ilproj +++ b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131.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="b473131.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.ilproj index 864e799259..21c57da119 100644 --- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.ilproj +++ b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_byte.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="b473131_byte.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.ilproj index 6c3fdfd7ff..b49adfa615 100644 --- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.ilproj +++ b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_fld.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="b473131_fld.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.ilproj index 85ca9b9eff..93dbaa4dad 100644 --- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.ilproj +++ b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_intptr.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="b473131_intptr.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.ilproj b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.ilproj index 2dac122384..26c2dd8628 100644 --- a/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.ilproj +++ b/tests/src/JIT/Regression/Dev11/Dev11_b473131/b473131_struct.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="b473131_struct.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj b/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj index a1363075cf..3c60f0e857 100644 --- a/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.csproj +++ b/tests/src/JIT/Regression/Dev11/DevDiv2_10623/DevDiv2_10623.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="DevDiv2_10623.cs" /> </ItemGroup> <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <PropertyGroup> - <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson> + <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> diff --git a/tests/src/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.ilproj b/tests/src/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.ilproj index 0381c9ea1a..9643aaa894 100644 --- a/tests/src/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.ilproj +++ b/tests/src/JIT/Regression/Dev11/DevDiv2_11321/DevDiv2_11321.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="DevDiv2_11321.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj b/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj index e31c891535..04e9aa1fb7 100644 --- a/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.csproj +++ b/tests/src/JIT/Regression/Dev11/DevDiv2_8863/DevDiv2_8863.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 --> @@ -33,14 +33,15 @@ <Compile Include="DevDiv2_8863.cs" /> </ItemGroup> <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <PropertyGroup> - <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson> + <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> diff --git a/tests/src/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.ilproj b/tests/src/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.ilproj index a6e4e4b901..b1250b87f8 100644 --- a/tests/src/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.ilproj +++ b/tests/src/JIT/Regression/Dev11/External/Dev11_14131/VectorForwarder.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="VectorForwarder.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.ilproj b/tests/src/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.ilproj index 199a76bb3f..13a0a65d3c 100644 --- a/tests/src/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.ilproj +++ b/tests/src/JIT/Regression/Dev11/External/Dev11_90434/UseUnalignedDouble.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="UseUnalignedDouble.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj b/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj index cbd917295c..5fe288df3c 100644 --- a/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.csproj +++ b/tests/src/JIT/Regression/Dev11/dev10_94677/loopvt.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="loopvt.cs" /> </ItemGroup> <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <PropertyGroup> - <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson> + <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> diff --git a/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj b/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj index b3fb91d0f9..8ff30a7293 100644 --- a/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.csproj +++ b/tests/src/JIT/Regression/Dev11/dev11_13912/dev11_13912.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="dev11_13912.cs" /> </ItemGroup> <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <PropertyGroup> - <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson> + <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> diff --git a/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj b/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj index 03abb76814..67e7cb0396 100644 --- a/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.csproj +++ b/tests/src/JIT/Regression/Dev11/dev11_165544/seqpts.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="seqpts.cs" /> </ItemGroup> <ItemGroup> - <None Include="$(JitPackagesConfigFileDirectory)threading+thread.packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)threading+thread\project.json" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> <PropertyGroup> - <PackagesConfigFile>$(JitPackagesConfigFileDirectory)threading+thread.packages.config</PackagesConfigFile> + <ProjectJson>$(JitPackagesConfigFileDirectory)threading+thread\project.json</ProjectJson> + <ProjectLockJson>$(JitPackagesConfigFileDirectory)threading+thread\project.lock.json</ProjectLockJson> </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> |