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/int64 | |
| 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/int64')
134 files changed, 352 insertions, 356 deletions
diff --git a/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.csproj b/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.csproj index 51d27d81e8..f31cc34db6 100644 --- a/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.csproj +++ b/tests/src/JIT/Methodical/int64/arrays/_dbglcs_long.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="lcs_long.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/int64/arrays/_dbglcs_ulong.csproj b/tests/src/JIT/Methodical/int64/arrays/_dbglcs_ulong.csproj index 3c591e68dd..f2849f2213 100644 --- a/tests/src/JIT/Methodical/int64/arrays/_dbglcs_ulong.csproj +++ b/tests/src/JIT/Methodical/int64/arrays/_dbglcs_ulong.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="lcs_ulong.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/int64/arrays/_il_dbghugedim.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_dbghugedim.ilproj index 58875df830..300b9480cb 100644 --- a/tests/src/JIT/Methodical/int64/arrays/_il_dbghugedim.ilproj +++ b/tests/src/JIT/Methodical/int64/arrays/_il_dbghugedim.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="hugedim.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_long.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_long.ilproj index f91d1bfed1..cd8dfbd357 100644 --- a/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_long.ilproj +++ b/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_long.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="lcs_long.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_ulong.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_ulong.ilproj index 01c8157eb1..3207dcab2f 100644 --- a/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_ulong.ilproj +++ b/tests/src/JIT/Methodical/int64/arrays/_il_dbglcs_ulong.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="lcs_ulong.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_relhugedim.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_relhugedim.ilproj index 4139118bf7..5bc038cf2b 100644 --- a/tests/src/JIT/Methodical/int64/arrays/_il_relhugedim.ilproj +++ b/tests/src/JIT/Methodical/int64/arrays/_il_relhugedim.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="hugedim.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_long.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_long.ilproj index 497ad6d18f..fa5d285f3f 100644 --- a/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_long.ilproj +++ b/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_long.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="lcs_long.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_ulong.ilproj b/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_ulong.ilproj index ff576ecfa1..274dced8a3 100644 --- a/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_ulong.ilproj +++ b/tests/src/JIT/Methodical/int64/arrays/_il_rellcs_ulong.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="lcs_ulong.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.csproj b/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.csproj index 51d27d81e8..f31cc34db6 100644 --- a/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.csproj +++ b/tests/src/JIT/Methodical/int64/arrays/_rellcs_long.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="lcs_long.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/int64/arrays/_rellcs_ulong.csproj b/tests/src/JIT/Methodical/int64/arrays/_rellcs_ulong.csproj index 3c591e68dd..f2849f2213 100644 --- a/tests/src/JIT/Methodical/int64/arrays/_rellcs_ulong.csproj +++ b/tests/src/JIT/Methodical/int64/arrays/_rellcs_ulong.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="lcs_ulong.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/int64/arrays/_speed_dbglcs_long.csproj b/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_long.csproj index 7ad959324a..90e98bb053 100644 --- a/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_long.csproj +++ b/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_long.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="lcs_long.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/int64/arrays/_speed_dbglcs_ulong.csproj b/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_ulong.csproj index 9601e97556..9b33d50d64 100644 --- a/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_ulong.csproj +++ b/tests/src/JIT/Methodical/int64/arrays/_speed_dbglcs_ulong.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="lcs_ulong.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/int64/arrays/_speed_rellcs_long.csproj b/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_long.csproj index 7ad959324a..90e98bb053 100644 --- a/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_long.csproj +++ b/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_long.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="lcs_long.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/int64/arrays/_speed_rellcs_ulong.csproj b/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_ulong.csproj index 9601e97556..9b33d50d64 100644 --- a/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_ulong.csproj +++ b/tests/src/JIT/Methodical/int64/arrays/_speed_rellcs_ulong.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="lcs_ulong.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/int64/misc/_dbgbinop.csproj b/tests/src/JIT/Methodical/int64/misc/_dbgbinop.csproj index bbaef968e2..f21753b90e 100644 --- a/tests/src/JIT/Methodical/int64/misc/_dbgbinop.csproj +++ b/tests/src/JIT/Methodical/int64/misc/_dbgbinop.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="binop.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/int64/misc/_dbgbox.csproj b/tests/src/JIT/Methodical/int64/misc/_dbgbox.csproj index d5534e81bd..255a732f6f 100644 --- a/tests/src/JIT/Methodical/int64/misc/_dbgbox.csproj +++ b/tests/src/JIT/Methodical/int64/misc/_dbgbox.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="box.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/int64/misc/_il_dbgbinop.ilproj b/tests/src/JIT/Methodical/int64/misc/_il_dbgbinop.ilproj index 0f35e5bdb5..42668f0427 100644 --- a/tests/src/JIT/Methodical/int64/misc/_il_dbgbinop.ilproj +++ b/tests/src/JIT/Methodical/int64/misc/_il_dbgbinop.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="binop.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/misc/_il_dbgbox.ilproj b/tests/src/JIT/Methodical/int64/misc/_il_dbgbox.ilproj index 79eae632a2..8f1dc9c51e 100644 --- a/tests/src/JIT/Methodical/int64/misc/_il_dbgbox.ilproj +++ b/tests/src/JIT/Methodical/int64/misc/_il_dbgbox.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="box.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/misc/_il_relbinop.ilproj b/tests/src/JIT/Methodical/int64/misc/_il_relbinop.ilproj index cf52104a01..22b0ddcdc1 100644 --- a/tests/src/JIT/Methodical/int64/misc/_il_relbinop.ilproj +++ b/tests/src/JIT/Methodical/int64/misc/_il_relbinop.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="binop.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/misc/_il_relbox.ilproj b/tests/src/JIT/Methodical/int64/misc/_il_relbox.ilproj index 97888b3b62..fcdc6cb110 100644 --- a/tests/src/JIT/Methodical/int64/misc/_il_relbox.ilproj +++ b/tests/src/JIT/Methodical/int64/misc/_il_relbox.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="box.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/misc/_relbinop.csproj b/tests/src/JIT/Methodical/int64/misc/_relbinop.csproj index bbaef968e2..f21753b90e 100644 --- a/tests/src/JIT/Methodical/int64/misc/_relbinop.csproj +++ b/tests/src/JIT/Methodical/int64/misc/_relbinop.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="binop.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/int64/misc/_relbox.csproj b/tests/src/JIT/Methodical/int64/misc/_relbox.csproj index d5534e81bd..255a732f6f 100644 --- a/tests/src/JIT/Methodical/int64/misc/_relbox.csproj +++ b/tests/src/JIT/Methodical/int64/misc/_relbox.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="box.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/int64/misc/_speed_dbgbinop.csproj b/tests/src/JIT/Methodical/int64/misc/_speed_dbgbinop.csproj index 9c423c8f7b..bd7d367005 100644 --- a/tests/src/JIT/Methodical/int64/misc/_speed_dbgbinop.csproj +++ b/tests/src/JIT/Methodical/int64/misc/_speed_dbgbinop.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="binop.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/int64/misc/_speed_dbgbox.csproj b/tests/src/JIT/Methodical/int64/misc/_speed_dbgbox.csproj index f8e25773c5..b87d1ec760 100644 --- a/tests/src/JIT/Methodical/int64/misc/_speed_dbgbox.csproj +++ b/tests/src/JIT/Methodical/int64/misc/_speed_dbgbox.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="box.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/int64/misc/_speed_relbinop.csproj b/tests/src/JIT/Methodical/int64/misc/_speed_relbinop.csproj index 9c423c8f7b..bd7d367005 100644 --- a/tests/src/JIT/Methodical/int64/misc/_speed_relbinop.csproj +++ b/tests/src/JIT/Methodical/int64/misc/_speed_relbinop.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="binop.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/int64/misc/_speed_relbox.csproj b/tests/src/JIT/Methodical/int64/misc/_speed_relbox.csproj index f8e25773c5..b87d1ec760 100644 --- a/tests/src/JIT/Methodical/int64/misc/_speed_relbox.csproj +++ b/tests/src/JIT/Methodical/int64/misc/_speed_relbox.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="box.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/int64/signed/_dbgs_addsub.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_addsub.csproj index b8e5f4a072..2f99ba6948 100644 --- a/tests/src/JIT/Methodical/int64/signed/_dbgs_addsub.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_addsub.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="s_addsub.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/int64/signed/_dbgs_ldc_div.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_div.csproj index 0f9da9c9db..3098dd01e4 100644 --- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_div.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_div.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="s_ldc_div.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/int64/signed/_dbgs_ldc_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mul.csproj index 9d7adf9569..bcdd4a8894 100644 --- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mul.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mul.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="s_ldc_mul.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/int64/signed/_dbgs_ldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mulovf.csproj index 0eadcc8a1f..cc39e32233 100644 --- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldc_mulovf.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="s_ldc_mulovf.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/int64/signed/_dbgs_ldfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mul.csproj index b712ddfc4e..6118070729 100644 --- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mul.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="s_ldfld_mul.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/int64/signed/_dbgs_ldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mulovf.csproj index 73e92948e0..7826a3335f 100644 --- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldfld_mulovf.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="s_ldfld_mulovf.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/int64/signed/_dbgs_ldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mul.csproj index d102a94372..780c5cf206 100644 --- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mul.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="s_ldsfld_mul.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/int64/signed/_dbgs_ldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mulovf.csproj index f3d4d3989c..7951d6bafe 100644 --- a/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_ldsfld_mulovf.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="s_ldsfld_mulovf.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/int64/signed/_dbgs_muldiv.csproj b/tests/src/JIT/Methodical/int64/signed/_dbgs_muldiv.csproj index 89eb1d80a3..5feeb83ace 100644 --- a/tests/src/JIT/Methodical/int64/signed/_dbgs_muldiv.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_dbgs_muldiv.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="s_muldiv.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/int64/signed/_il_dbgs_addsub.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_addsub.ilproj index 3947bbb2b7..8a83147ddd 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_addsub.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_addsub.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="s_addsub.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_div.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_div.ilproj index 659c90460d..fad09e7e20 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_div.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_div.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="s_ldc_div.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mul.ilproj index b235485b6b..0a9c5b787e 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mul.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mul.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="s_ldc_mul.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mulovf.ilproj index 67660034c1..fc8f70f676 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mulovf.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldc_mulovf.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="s_ldc_mulovf.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mul.ilproj index ed69ce5d89..c1f7f47b1a 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mul.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mul.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="s_ldfld_mul.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mulovf.ilproj index 852e0c0144..e3c0734f76 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mulovf.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldfld_mulovf.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="s_ldfld_mulovf.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mul.ilproj index deb2ece3ef..e45b1f82b9 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mul.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mul.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="s_ldsfld_mul.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mulovf.ilproj index 4260358dca..a6c60962c8 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mulovf.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_ldsfld_mulovf.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="s_ldsfld_mulovf.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_muldiv.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_muldiv.ilproj index 1ba2be5d1f..4ab57d5232 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_dbgs_muldiv.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_dbgs_muldiv.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="s_muldiv.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_addsub.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_addsub.ilproj index 00ef4df874..a58326f373 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_rels_addsub.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_addsub.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="s_addsub.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_div.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_div.ilproj index cb2efc8cea..8e1a0c5c75 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_div.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_div.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="s_ldc_div.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mul.ilproj index 62f8ab0677..37ba094107 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mul.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mul.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="s_ldc_mul.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mulovf.ilproj index 4ccead82dc..81cf0c0dff 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mulovf.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldc_mulovf.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="s_ldc_mulovf.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mul.ilproj index 764373052d..1dcc7856f0 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mul.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mul.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="s_ldfld_mul.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mulovf.ilproj index 544b12b565..a380dff748 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mulovf.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldfld_mulovf.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="s_ldfld_mulovf.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mul.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mul.ilproj index 2e461218ba..bfceb89ef0 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mul.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mul.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="s_ldsfld_mul.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mulovf.ilproj index 34aa66b28a..1675c9ceac 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mulovf.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_ldsfld_mulovf.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="s_ldsfld_mulovf.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_il_rels_muldiv.ilproj b/tests/src/JIT/Methodical/int64/signed/_il_rels_muldiv.ilproj index cf9d0200b8..c3abf80335 100644 --- a/tests/src/JIT/Methodical/int64/signed/_il_rels_muldiv.ilproj +++ b/tests/src/JIT/Methodical/int64/signed/_il_rels_muldiv.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="s_muldiv.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/signed/_rels_addsub.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_addsub.csproj index b8e5f4a072..2f99ba6948 100644 --- a/tests/src/JIT/Methodical/int64/signed/_rels_addsub.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_rels_addsub.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="s_addsub.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/int64/signed/_rels_ldc_div.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_div.csproj index 0f9da9c9db..3098dd01e4 100644 --- a/tests/src/JIT/Methodical/int64/signed/_rels_ldc_div.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_div.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="s_ldc_div.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/int64/signed/_rels_ldc_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mul.csproj index 9d7adf9569..bcdd4a8894 100644 --- a/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mul.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mul.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="s_ldc_mul.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/int64/signed/_rels_ldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mulovf.csproj index 0eadcc8a1f..cc39e32233 100644 --- a/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldc_mulovf.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="s_ldc_mulovf.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/int64/signed/_rels_ldfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mul.csproj index b712ddfc4e..6118070729 100644 --- a/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mul.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="s_ldfld_mul.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/int64/signed/_rels_ldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mulovf.csproj index 73e92948e0..7826a3335f 100644 --- a/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldfld_mulovf.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="s_ldfld_mulovf.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/int64/signed/_rels_ldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mul.csproj index d102a94372..780c5cf206 100644 --- a/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mul.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="s_ldsfld_mul.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/int64/signed/_rels_ldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mulovf.csproj index f3d4d3989c..7951d6bafe 100644 --- a/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_rels_ldsfld_mulovf.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="s_ldsfld_mulovf.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/int64/signed/_rels_muldiv.csproj b/tests/src/JIT/Methodical/int64/signed/_rels_muldiv.csproj index 89eb1d80a3..5feeb83ace 100644 --- a/tests/src/JIT/Methodical/int64/signed/_rels_muldiv.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_rels_muldiv.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="s_muldiv.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/int64/signed/_speed_dbgs_addsub.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_addsub.csproj index 2ca4c59534..71ae4fb590 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_addsub.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_addsub.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="s_addsub.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/int64/signed/_speed_dbgs_ldc_div.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_div.csproj index 9015e6c114..8d28037da7 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_div.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_div.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="s_ldc_div.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/int64/signed/_speed_dbgs_ldc_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mul.csproj index 28cc4605da..1856115a04 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mul.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mul.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="s_ldc_mul.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/int64/signed/_speed_dbgs_ldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mulovf.csproj index 670c6c4f14..9c52971333 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldc_mulovf.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="s_ldc_mulovf.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/int64/signed/_speed_dbgs_ldfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mul.csproj index 41c9c32c0b..ba80280170 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mul.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="s_ldfld_mul.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/int64/signed/_speed_dbgs_ldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mulovf.csproj index c0d464566a..e15d8b5f54 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldfld_mulovf.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="s_ldfld_mulovf.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/int64/signed/_speed_dbgs_ldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mul.csproj index 7c963dd622..c753bc48c1 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mul.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="s_ldsfld_mul.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/int64/signed/_speed_dbgs_ldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mulovf.csproj index 54e9a1f2cd..8c6d02b6e8 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_ldsfld_mulovf.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="s_ldsfld_mulovf.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/int64/signed/_speed_dbgs_muldiv.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_muldiv.csproj index ebe2dcce02..8ba64938c5 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_muldiv.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_dbgs_muldiv.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="s_muldiv.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/int64/signed/_speed_rels_addsub.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_addsub.csproj index 2ca4c59534..71ae4fb590 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_addsub.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_addsub.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="s_addsub.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/int64/signed/_speed_rels_ldc_div.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_div.csproj index 9015e6c114..8d28037da7 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_div.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_div.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="s_ldc_div.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/int64/signed/_speed_rels_ldc_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mul.csproj index 28cc4605da..1856115a04 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mul.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mul.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="s_ldc_mul.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/int64/signed/_speed_rels_ldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mulovf.csproj index 670c6c4f14..9c52971333 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldc_mulovf.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="s_ldc_mulovf.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/int64/signed/_speed_rels_ldfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mul.csproj index 41c9c32c0b..ba80280170 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mul.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="s_ldfld_mul.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/int64/signed/_speed_rels_ldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mulovf.csproj index c0d464566a..e15d8b5f54 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldfld_mulovf.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="s_ldfld_mulovf.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/int64/signed/_speed_rels_ldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mul.csproj index 7c963dd622..c753bc48c1 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mul.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="s_ldsfld_mul.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/int64/signed/_speed_rels_ldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mulovf.csproj index 54e9a1f2cd..8c6d02b6e8 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_ldsfld_mulovf.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="s_ldsfld_mulovf.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/int64/signed/_speed_rels_muldiv.csproj b/tests/src/JIT/Methodical/int64/signed/_speed_rels_muldiv.csproj index ebe2dcce02..8ba64938c5 100644 --- a/tests/src/JIT/Methodical/int64/signed/_speed_rels_muldiv.csproj +++ b/tests/src/JIT/Methodical/int64/signed/_speed_rels_muldiv.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="s_muldiv.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/int64/superlong/_dbgsuperlong.csproj b/tests/src/JIT/Methodical/int64/superlong/_dbgsuperlong.csproj index eb255e9238..17db469a28 100644 --- a/tests/src/JIT/Methodical/int64/superlong/_dbgsuperlong.csproj +++ b/tests/src/JIT/Methodical/int64/superlong/_dbgsuperlong.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="superlong.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/int64/superlong/_il_dbgsuperlong.ilproj b/tests/src/JIT/Methodical/int64/superlong/_il_dbgsuperlong.ilproj index 35e7d1c86d..1cb1debf5c 100644 --- a/tests/src/JIT/Methodical/int64/superlong/_il_dbgsuperlong.ilproj +++ b/tests/src/JIT/Methodical/int64/superlong/_il_dbgsuperlong.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="superlong.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/superlong/_il_relsuperlong.ilproj b/tests/src/JIT/Methodical/int64/superlong/_il_relsuperlong.ilproj index c6a48551b3..a29b3f99f9 100644 --- a/tests/src/JIT/Methodical/int64/superlong/_il_relsuperlong.ilproj +++ b/tests/src/JIT/Methodical/int64/superlong/_il_relsuperlong.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="superlong.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.csproj b/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.csproj index eb255e9238..17db469a28 100644 --- a/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.csproj +++ b/tests/src/JIT/Methodical/int64/superlong/_relsuperlong.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="superlong.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/int64/superlong/_speed_dbgsuperlong.csproj b/tests/src/JIT/Methodical/int64/superlong/_speed_dbgsuperlong.csproj index 252dd331d3..6411c81ea7 100644 --- a/tests/src/JIT/Methodical/int64/superlong/_speed_dbgsuperlong.csproj +++ b/tests/src/JIT/Methodical/int64/superlong/_speed_dbgsuperlong.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="superlong.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/int64/superlong/_speed_relsuperlong.csproj b/tests/src/JIT/Methodical/int64/superlong/_speed_relsuperlong.csproj index 252dd331d3..6411c81ea7 100644 --- a/tests/src/JIT/Methodical/int64/superlong/_speed_relsuperlong.csproj +++ b/tests/src/JIT/Methodical/int64/superlong/_speed_relsuperlong.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="superlong.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/int64/unsigned/_dbgaddsub.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgaddsub.csproj index ba2e7aefda..b62bca3af3 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_dbgaddsub.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgaddsub.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="addsub.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/int64/unsigned/_dbgldc_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mul.csproj index 798c11305d..dc3a7c8203 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mul.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mul.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="ldc_mul.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/int64/unsigned/_dbgldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mulovf.csproj index 71fff1942b..fef69bb1f3 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldc_mulovf.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="ldc_mulovf.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/int64/unsigned/_dbgldfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mul.csproj index 91000b9fd0..0d3e660900 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mul.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="ldfld_mul.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/int64/unsigned/_dbgldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mulovf.csproj index ba1c682cde..ab79b61e5f 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldfld_mulovf.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="ldfld_mulovf.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/int64/unsigned/_dbgldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mul.csproj index 026b434318..4a31ea465a 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mul.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="ldsfld_mul.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/int64/unsigned/_dbgldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mulovf.csproj index e1719dd271..0258fd63b9 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgldsfld_mulovf.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="ldsfld_mulovf.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/int64/unsigned/_dbgmuldiv.csproj b/tests/src/JIT/Methodical/int64/unsigned/_dbgmuldiv.csproj index 3b938e0f05..45e0e6529c 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_dbgmuldiv.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_dbgmuldiv.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="muldiv.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/int64/unsigned/_il_dbgaddsub.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgaddsub.ilproj index 714880b227..144a968c95 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgaddsub.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgaddsub.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="addsub.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mul.ilproj index 87dbd03a9b..7eb2689e52 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mul.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mul.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="ldc_mul.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mulovf.ilproj index 556fee7f86..c0053920c9 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mulovf.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldc_mulovf.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="ldc_mulovf.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mul.ilproj index 0f7193a939..87cf919a94 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mul.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mul.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="ldfld_mul.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mulovf.ilproj index b87f7cbb61..67c19842d0 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mulovf.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldfld_mulovf.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="ldfld_mulovf.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mul.ilproj index 18fa6c2eb9..f330074b33 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mul.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mul.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="ldsfld_mul.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mulovf.ilproj index ef44149844..9ae04782f4 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mulovf.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgldsfld_mulovf.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="ldsfld_mulovf.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgmuldiv.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgmuldiv.ilproj index 61107e1a70..add7d1e487 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_dbgmuldiv.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_dbgmuldiv.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="muldiv.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_reladdsub.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_reladdsub.ilproj index 3e0bf7d40c..4161ffac1f 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_reladdsub.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_reladdsub.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="addsub.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mul.ilproj index 0a4f0d9781..0221370b27 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mul.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mul.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="ldc_mul.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mulovf.ilproj index f27ee29b32..27a2c9b495 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mulovf.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldc_mulovf.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="ldc_mulovf.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mul.ilproj index e066202fdb..68380cc3e3 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mul.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mul.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="ldfld_mul.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mulovf.ilproj index a3c6f6426f..9c67c21e4f 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mulovf.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldfld_mulovf.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="ldfld_mulovf.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mul.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mul.ilproj index 1c35422a0b..5a00e5d6b4 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mul.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mul.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="ldsfld_mul.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mulovf.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mulovf.ilproj index 9729f16f21..65ad7fdc4b 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mulovf.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relldsfld_mulovf.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="ldsfld_mulovf.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_il_relmuldiv.ilproj b/tests/src/JIT/Methodical/int64/unsigned/_il_relmuldiv.ilproj index 37b1dc2c18..a1fa68e647 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_il_relmuldiv.ilproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_il_relmuldiv.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="muldiv.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.csproj b/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.csproj index ba2e7aefda..b62bca3af3 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_reladdsub.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="addsub.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/int64/unsigned/_relldc_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldc_mul.csproj index 798c11305d..dc3a7c8203 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_relldc_mul.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_relldc_mul.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="ldc_mul.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/int64/unsigned/_relldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldc_mulovf.csproj index 71fff1942b..fef69bb1f3 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_relldc_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_relldc_mulovf.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="ldc_mulovf.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/int64/unsigned/_relldfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mul.csproj index 91000b9fd0..0d3e660900 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mul.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="ldfld_mul.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/int64/unsigned/_relldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mulovf.csproj index ba1c682cde..ab79b61e5f 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_relldfld_mulovf.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="ldfld_mulovf.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/int64/unsigned/_relldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mul.csproj index 026b434318..4a31ea465a 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mul.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="ldsfld_mul.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/int64/unsigned/_relldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mulovf.csproj index e1719dd271..0258fd63b9 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_relldsfld_mulovf.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="ldsfld_mulovf.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/int64/unsigned/_relmuldiv.csproj b/tests/src/JIT/Methodical/int64/unsigned/_relmuldiv.csproj index 3b938e0f05..45e0e6529c 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_relmuldiv.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_relmuldiv.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="muldiv.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/int64/unsigned/_speed_dbgaddsub.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgaddsub.csproj index 686d56b96a..f1b4a93459 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgaddsub.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgaddsub.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="addsub.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/int64/unsigned/_speed_dbgldc_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mul.csproj index 15a98dd477..04571eb4a0 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mul.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mul.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="ldc_mul.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/int64/unsigned/_speed_dbgldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mulovf.csproj index 68607531e3..04aa93618b 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldc_mulovf.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="ldc_mulovf.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/int64/unsigned/_speed_dbgldfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mul.csproj index 19230782de..c17cf7106e 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mul.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="ldfld_mul.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/int64/unsigned/_speed_dbgldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mulovf.csproj index 394dc33b6a..14af800195 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldfld_mulovf.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="ldfld_mulovf.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/int64/unsigned/_speed_dbgldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mul.csproj index dd6d9c6285..61a20d0dde 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mul.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="ldsfld_mul.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/int64/unsigned/_speed_dbgldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mulovf.csproj index ef2291da94..38bfff0de7 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgldsfld_mulovf.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="ldsfld_mulovf.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/int64/unsigned/_speed_dbgmuldiv.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgmuldiv.csproj index 025e760573..31e23211a2 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgmuldiv.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_dbgmuldiv.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="muldiv.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/int64/unsigned/_speed_reladdsub.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_reladdsub.csproj index 686d56b96a..f1b4a93459 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_reladdsub.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_reladdsub.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="addsub.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/int64/unsigned/_speed_relldc_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mul.csproj index 15a98dd477..04571eb4a0 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mul.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mul.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="ldc_mul.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/int64/unsigned/_speed_relldc_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mulovf.csproj index 68607531e3..04aa93618b 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldc_mulovf.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="ldc_mulovf.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/int64/unsigned/_speed_relldfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mul.csproj index 19230782de..c17cf7106e 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mul.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="ldfld_mul.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/int64/unsigned/_speed_relldfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mulovf.csproj index 394dc33b6a..14af800195 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldfld_mulovf.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="ldfld_mulovf.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/int64/unsigned/_speed_relldsfld_mul.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mul.csproj index dd6d9c6285..61a20d0dde 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mul.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mul.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="ldsfld_mul.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/int64/unsigned/_speed_relldsfld_mulovf.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mulovf.csproj index ef2291da94..38bfff0de7 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mulovf.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relldsfld_mulovf.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="ldsfld_mulovf.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/int64/unsigned/_speed_relmuldiv.csproj b/tests/src/JIT/Methodical/int64/unsigned/_speed_relmuldiv.csproj index 025e760573..31e23211a2 100644 --- a/tests/src/JIT/Methodical/int64/unsigned/_speed_relmuldiv.csproj +++ b/tests/src/JIT/Methodical/int64/unsigned/_speed_relmuldiv.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="muldiv.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)' != '' "> |