diff options
Diffstat (limited to 'tests/src/JIT/jit64/regress')
37 files changed, 84 insertions, 95 deletions
diff --git a/tests/src/JIT/jit64/regress/asurt/143616/foo.csproj b/tests/src/JIT/jit64/regress/asurt/143616/foo.csproj index 4f9d4a23b8..611483a716 100644 --- a/tests/src/JIT/jit64/regress/asurt/143616/foo.csproj +++ b/tests/src/JIT/jit64/regress/asurt/143616/foo.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="foo.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/jit64/regress/ddb/103087/103087.csproj b/tests/src/JIT/jit64/regress/ddb/103087/103087.csproj index 87e627195a..6e2eeabf71 100644 --- a/tests/src/JIT/jit64/regress/ddb/103087/103087.csproj +++ b/tests/src/JIT/jit64/regress/ddb/103087/103087.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="103087.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/jit64/regress/ddb/113574/113574.csproj b/tests/src/JIT/jit64/regress/ddb/113574/113574.csproj index 5929da9c57..b4bddbaa83 100644 --- a/tests/src/JIT/jit64/regress/ddb/113574/113574.csproj +++ b/tests/src/JIT/jit64/regress/ddb/113574/113574.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="113574.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/jit64/regress/ddb/118414/118414.ilproj b/tests/src/JIT/jit64/regress/ddb/118414/118414.ilproj index 031687f4fc..2052d672ff 100644 --- a/tests/src/JIT/jit64/regress/ddb/118414/118414.ilproj +++ b/tests/src/JIT/jit64/regress/ddb/118414/118414.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="118414.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/ddb/127931/127931.ilproj b/tests/src/JIT/jit64/regress/ddb/127931/127931.ilproj index 71dc037b48..355829f85a 100644 --- a/tests/src/JIT/jit64/regress/ddb/127931/127931.ilproj +++ b/tests/src/JIT/jit64/regress/ddb/127931/127931.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="127931.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj b/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj index 995af47e57..7cc76183ac 100644 --- a/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj +++ b/tests/src/JIT/jit64/regress/ddb/132977/132977.csproj @@ -13,7 +13,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> + <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,14 +33,15 @@ <Compile Include="132977.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/jit64/regress/ndpw/160545/simple.csproj b/tests/src/JIT/jit64/regress/ndpw/160545/simple.csproj index 401c89b637..4e83ed39db 100644 --- a/tests/src/JIT/jit64/regress/ndpw/160545/simple.csproj +++ b/tests/src/JIT/jit64/regress/ndpw/160545/simple.csproj @@ -13,7 +13,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> + <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,14 +33,15 @@ <Compile Include="simple.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/jit64/regress/ndpw/21015/interior_pointer.csproj b/tests/src/JIT/jit64/regress/ndpw/21015/interior_pointer.csproj index c4a09eea64..6fade420a2 100644 --- a/tests/src/JIT/jit64/regress/ndpw/21015/interior_pointer.csproj +++ b/tests/src/JIT/jit64/regress/ndpw/21015/interior_pointer.csproj @@ -13,7 +13,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> + <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,14 +33,15 @@ <Compile Include="interior_pointer.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/jit64/regress/phoenix/62322/test.ilproj b/tests/src/JIT/jit64/regress/phoenix/62322/test.ilproj index 60fa807ed7..005d45c2dc 100644 --- a/tests/src/JIT/jit64/regress/phoenix/62322/test.ilproj +++ b/tests/src/JIT/jit64/regress/phoenix/62322/test.ilproj @@ -13,7 +13,6 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,7 +32,6 @@ <Compile Include="test.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/vsw/102964/test.csproj b/tests/src/JIT/jit64/regress/vsw/102964/test.csproj index 820a7dd9dc..ca2d4f2fce 100644 --- a/tests/src/JIT/jit64/regress/vsw/102964/test.csproj +++ b/tests/src/JIT/jit64/regress/vsw/102964/test.csproj @@ -13,7 +13,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> + <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,14 +33,15 @@ <Compile Include="test.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/jit64/regress/vsw/102974/test.ilproj b/tests/src/JIT/jit64/regress/vsw/102974/test.ilproj index 60fa807ed7..005d45c2dc 100644 --- a/tests/src/JIT/jit64/regress/vsw/102974/test.ilproj +++ b/tests/src/JIT/jit64/regress/vsw/102974/test.ilproj @@ -13,7 +13,6 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,7 +32,6 @@ <Compile Include="test.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/vsw/153682/test.ilproj b/tests/src/JIT/jit64/regress/vsw/153682/test.ilproj index 60fa807ed7..005d45c2dc 100644 --- a/tests/src/JIT/jit64/regress/vsw/153682/test.ilproj +++ b/tests/src/JIT/jit64/regress/vsw/153682/test.ilproj @@ -13,7 +13,6 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,7 +32,6 @@ <Compile Include="test.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/vsw/266693/test.ilproj b/tests/src/JIT/jit64/regress/vsw/266693/test.ilproj index 60fa807ed7..005d45c2dc 100644 --- a/tests/src/JIT/jit64/regress/vsw/266693/test.ilproj +++ b/tests/src/JIT/jit64/regress/vsw/266693/test.ilproj @@ -13,7 +13,6 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,7 +32,6 @@ <Compile Include="test.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/vsw/329169/test.csproj b/tests/src/JIT/jit64/regress/vsw/329169/test.csproj index 820a7dd9dc..ca2d4f2fce 100644 --- a/tests/src/JIT/jit64/regress/vsw/329169/test.csproj +++ b/tests/src/JIT/jit64/regress/vsw/329169/test.csproj @@ -13,7 +13,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> + <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,14 +33,15 @@ <Compile Include="test.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/jit64/regress/vsw/333007/test1.ilproj b/tests/src/JIT/jit64/regress/vsw/333007/test1.ilproj index e9d485f484..d40c5e5c93 100644 --- a/tests/src/JIT/jit64/regress/vsw/333007/test1.ilproj +++ b/tests/src/JIT/jit64/regress/vsw/333007/test1.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="test1.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/vsw/336666/test1.ilproj b/tests/src/JIT/jit64/regress/vsw/336666/test1.ilproj index e9d485f484..d40c5e5c93 100644 --- a/tests/src/JIT/jit64/regress/vsw/336666/test1.ilproj +++ b/tests/src/JIT/jit64/regress/vsw/336666/test1.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="test1.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/vsw/373472/test.csproj b/tests/src/JIT/jit64/regress/vsw/373472/test.csproj index 91e2835791..785a7a72b5 100644 --- a/tests/src/JIT/jit64/regress/vsw/373472/test.csproj +++ b/tests/src/JIT/jit64/regress/vsw/373472/test.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="test.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/jit64/regress/vsw/373472/test.ilproj b/tests/src/JIT/jit64/regress/vsw/373472/test.ilproj index e03cb01e39..e1f57ec14d 100644 --- a/tests/src/JIT/jit64/regress/vsw/373472/test.ilproj +++ b/tests/src/JIT/jit64/regress/vsw/373472/test.ilproj @@ -13,7 +13,6 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -34,7 +33,6 @@ <Compile Include="test.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/vsw/404708/test.ilproj b/tests/src/JIT/jit64/regress/vsw/404708/test.ilproj index 60fa807ed7..005d45c2dc 100644 --- a/tests/src/JIT/jit64/regress/vsw/404708/test.ilproj +++ b/tests/src/JIT/jit64/regress/vsw/404708/test.ilproj @@ -13,7 +13,6 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,7 +32,6 @@ <Compile Include="test.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/vsw/460412/test.ilproj b/tests/src/JIT/jit64/regress/vsw/460412/test.ilproj index 60fa807ed7..005d45c2dc 100644 --- a/tests/src/JIT/jit64/regress/vsw/460412/test.ilproj +++ b/tests/src/JIT/jit64/regress/vsw/460412/test.ilproj @@ -13,7 +13,6 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,7 +32,6 @@ <Compile Include="test.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/vsw/471729/test.csproj b/tests/src/JIT/jit64/regress/vsw/471729/test.csproj index 820a7dd9dc..ca2d4f2fce 100644 --- a/tests/src/JIT/jit64/regress/vsw/471729/test.csproj +++ b/tests/src/JIT/jit64/regress/vsw/471729/test.csproj @@ -13,7 +13,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> + <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,14 +33,15 @@ <Compile Include="test.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/jit64/regress/vsw/517867/test.csproj b/tests/src/JIT/jit64/regress/vsw/517867/test.csproj index 22d34e22d8..47b8ad6915 100644 --- a/tests/src/JIT/jit64/regress/vsw/517867/test.csproj +++ b/tests/src/JIT/jit64/regress/vsw/517867/test.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="test.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/jit64/regress/vsw/524070/test1.csproj b/tests/src/JIT/jit64/regress/vsw/524070/test1.csproj index 81b3c3ac42..40fb9278d2 100644 --- a/tests/src/JIT/jit64/regress/vsw/524070/test1.csproj +++ b/tests/src/JIT/jit64/regress/vsw/524070/test1.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="test1.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/jit64/regress/vsw/524070/test2.csproj b/tests/src/JIT/jit64/regress/vsw/524070/test2.csproj index b8d3f9a412..37ed362906 100644 --- a/tests/src/JIT/jit64/regress/vsw/524070/test2.csproj +++ b/tests/src/JIT/jit64/regress/vsw/524070/test2.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="test2.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/jit64/regress/vsw/528315/simple-repro.csproj b/tests/src/JIT/jit64/regress/vsw/528315/simple-repro.csproj index 860a872295..ac4e7bdf43 100644 --- a/tests/src/JIT/jit64/regress/vsw/528315/simple-repro.csproj +++ b/tests/src/JIT/jit64/regress/vsw/528315/simple-repro.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="simple-repro.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/jit64/regress/vsw/534486/exchange.ilproj b/tests/src/JIT/jit64/regress/vsw/534486/exchange.ilproj index 0507aef98c..31485dc12e 100644 --- a/tests/src/JIT/jit64/regress/vsw/534486/exchange.ilproj +++ b/tests/src/JIT/jit64/regress/vsw/534486/exchange.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="exchange.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/vsw/538615/test1.csproj b/tests/src/JIT/jit64/regress/vsw/538615/test1.csproj index 81b3c3ac42..40fb9278d2 100644 --- a/tests/src/JIT/jit64/regress/vsw/538615/test1.csproj +++ b/tests/src/JIT/jit64/regress/vsw/538615/test1.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="test1.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/jit64/regress/vsw/539509/test1.csproj b/tests/src/JIT/jit64/regress/vsw/539509/test1.csproj index 57a90d0f22..e30ae66801 100644 --- a/tests/src/JIT/jit64/regress/vsw/539509/test1.csproj +++ b/tests/src/JIT/jit64/regress/vsw/539509/test1.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="test1.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/jit64/regress/vsw/541067/test1.csproj b/tests/src/JIT/jit64/regress/vsw/541067/test1.csproj index 81b3c3ac42..40fb9278d2 100644 --- a/tests/src/JIT/jit64/regress/vsw/541067/test1.csproj +++ b/tests/src/JIT/jit64/regress/vsw/541067/test1.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="test1.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/jit64/regress/vsw/543229/test.csproj b/tests/src/JIT/jit64/regress/vsw/543229/test.csproj index 22d34e22d8..47b8ad6915 100644 --- a/tests/src/JIT/jit64/regress/vsw/543229/test.csproj +++ b/tests/src/JIT/jit64/regress/vsw/543229/test.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="test.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/jit64/regress/vsw/549880/test.csproj b/tests/src/JIT/jit64/regress/vsw/549880/test.csproj index 820a7dd9dc..ca2d4f2fce 100644 --- a/tests/src/JIT/jit64/regress/vsw/549880/test.csproj +++ b/tests/src/JIT/jit64/regress/vsw/549880/test.csproj @@ -13,7 +13,7 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> + <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,14 +33,15 @@ <Compile Include="test.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/jit64/regress/vsw/575343/test.ilproj b/tests/src/JIT/jit64/regress/vsw/575343/test.ilproj index 60fa807ed7..005d45c2dc 100644 --- a/tests/src/JIT/jit64/regress/vsw/575343/test.ilproj +++ b/tests/src/JIT/jit64/regress/vsw/575343/test.ilproj @@ -13,7 +13,6 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -33,7 +32,6 @@ <Compile Include="test.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/vsw/575343/test2.ilproj b/tests/src/JIT/jit64/regress/vsw/575343/test2.ilproj index 2513a32e47..d232c9314e 100644 --- a/tests/src/JIT/jit64/regress/vsw/575343/test2.ilproj +++ b/tests/src/JIT/jit64/regress/vsw/575343/test2.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="test2.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/vsw/601425/stret.csproj b/tests/src/JIT/jit64/regress/vsw/601425/stret.csproj index b976d53a14..458191393b 100644 --- a/tests/src/JIT/jit64/regress/vsw/601425/stret.csproj +++ b/tests/src/JIT/jit64/regress/vsw/601425/stret.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="stret.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/jit64/regress/vsw/606733/Bug606733.ilproj b/tests/src/JIT/jit64/regress/vsw/606733/Bug606733.ilproj index 1186aacc85..56ae6b1973 100644 --- a/tests/src/JIT/jit64/regress/vsw/606733/Bug606733.ilproj +++ b/tests/src/JIT/jit64/regress/vsw/606733/Bug606733.ilproj @@ -13,7 +13,6 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -34,7 +33,6 @@ <Compile Include="Bug606733.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/vsw/607586/607586.ilproj b/tests/src/JIT/jit64/regress/vsw/607586/607586.ilproj index 3e9e925fe3..4e59bdbde7 100644 --- a/tests/src/JIT/jit64/regress/vsw/607586/607586.ilproj +++ b/tests/src/JIT/jit64/regress/vsw/607586/607586.ilproj @@ -13,7 +13,6 @@ <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\11.0\UITestExtensionPackages</ReferencePath> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir> - <RestorePackages>true</RestorePackages> <NuGetPackageImportStamp>7a9bfb7d</NuGetPackageImportStamp> </PropertyGroup> <!-- Default configurations to help VS understand the configurations --> @@ -34,7 +33,6 @@ <Compile Include="607586.il" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> diff --git a/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.csproj b/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.csproj index 927188a220..82d30d41ff 100644 --- a/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.csproj +++ b/tests/src/JIT/jit64/regress/vsw/610378/vsw610378.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="BigFrame.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)' != '' "> |