diff options
| author | Matt Ellis <matell@microsoft.com> | 2015-06-30 14:11:27 -0700 |
|---|---|---|
| committer | Matt Ellis <matell@microsoft.com> | 2015-06-30 14:11:27 -0700 |
| commit | 3783d7e53f1e7382a0d5d33f739ca687f9136196 (patch) | |
| tree | ad1aca129cb5eef9e97c4e007289dbbd39bde53e /tests/src/JIT/Methodical/VT | |
| parent | 3d8e9b6cb7a8d57ad836cd4748a7260e57477ed3 (diff) | |
| download | coreclr-3783d7e53f1e7382a0d5d33f739ca687f9136196.tar.gz coreclr-3783d7e53f1e7382a0d5d33f739ca687f9136196.tar.bz2 coreclr-3783d7e53f1e7382a0d5d33f739ca687f9136196.zip | |
Speed up package resotre of JIT Test build
We spend a fair amount of time (six wall clock minutes on my machine)
doing package restore for the JIT tests. This is because each project
has its own packages.config file, so during the build we call nuget
restore for each project.
There are only four unique packages.config files for all these tests, so
this change moves them to tests/src/JIT/config and updates the project
files to consume them from there.
This means during the build the `EnsureDependencies` target does not
need to invoke nuget restore as often and the build is much faster as a
result.
Diffstat (limited to 'tests/src/JIT/Methodical/VT')
66 files changed, 307 insertions, 145 deletions
diff --git a/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj b/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj index 600b92cb12..cd9d109b46 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_dbgcall.csproj @@ -34,13 +34,16 @@ <Compile Include="call.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj b/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj index 55241a47d5..79707a3f06 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_dbgjumper.csproj @@ -34,13 +34,16 @@ <Compile Include="jumper.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj b/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj index 80d12db22d..211762c4d6 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_dbgjumps.csproj @@ -34,13 +34,16 @@ <Compile Include="jumps.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj b/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj index dbb35747be..23ff391ad4 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_dbgvtret.csproj @@ -34,13 +34,16 @@ <Compile Include="vtret.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj b/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj index 600b92cb12..cd9d109b46 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_relcall.csproj @@ -34,13 +34,16 @@ <Compile Include="call.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj b/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj index 55241a47d5..79707a3f06 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_reljumper.csproj @@ -34,13 +34,16 @@ <Compile Include="jumper.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj b/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj index 80d12db22d..211762c4d6 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_reljumps.csproj @@ -34,13 +34,16 @@ <Compile Include="jumps.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj b/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj index dbb35747be..23ff391ad4 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_relvtret.csproj @@ -34,13 +34,16 @@ <Compile Include="vtret.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj index 6fa2595fe9..981f887773 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgcall.csproj @@ -34,13 +34,16 @@ <Compile Include="call.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj index 53c354ef86..ed45279393 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumper.csproj @@ -34,13 +34,16 @@ <Compile Include="jumper.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj index adcc65af21..7d2e240824 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgjumps.csproj @@ -34,13 +34,16 @@ <Compile Include="jumps.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj index 98145ede53..64da839c03 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_speed_dbgvtret.csproj @@ -34,13 +34,16 @@ <Compile Include="vtret.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj index 6fa2595fe9..981f887773 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_speed_relcall.csproj @@ -34,13 +34,16 @@ <Compile Include="call.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj index 53c354ef86..ed45279393 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_speed_reljumper.csproj @@ -34,13 +34,16 @@ <Compile Include="jumper.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj index adcc65af21..7d2e240824 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_speed_reljumps.csproj @@ -34,13 +34,16 @@ <Compile Include="jumps.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj b/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj index 98145ede53..64da839c03 100644 --- a/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj +++ b/tests/src/JIT/Methodical/VT/callconv/_speed_relvtret.csproj @@ -34,13 +34,16 @@ <Compile Include="vtret.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/callconv/packages.config b/tests/src/JIT/Methodical/VT/callconv/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/Methodical/VT/callconv/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> -</packages>
\ No newline at end of file diff --git a/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj b/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj index ea54f76dad..ba4e071ca1 100644 --- a/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_dbgctor_recurse.csproj @@ -34,13 +34,16 @@ <Compile Include="ctor_recurse.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj b/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj index afb7ee09ce..609f3d8722 100644 --- a/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_dbghan2.csproj @@ -34,13 +34,16 @@ <Compile Include="han2.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj b/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj index b5558212a2..e8ad08f3c3 100644 --- a/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_dbghan3.csproj @@ -34,13 +34,16 @@ <Compile Include="han3.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj b/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj index e8f17f4166..76afc1b4f4 100644 --- a/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_dbghan3_ctor.csproj @@ -34,13 +34,16 @@ <Compile Include="han3_ctor.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj b/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj index 43ee2995ad..3912151001 100644 --- a/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_dbghan3_ref.csproj @@ -34,13 +34,16 @@ <Compile Include="han3_ref.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj b/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj index 354a51c20f..5b3d75f348 100644 --- a/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_dbghanoi.csproj @@ -34,13 +34,16 @@ <Compile Include="hanoi.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj b/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj index b9598ebb09..8392e80786 100644 --- a/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_dbgknight.csproj @@ -34,13 +34,16 @@ <Compile Include="knight.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj b/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj index ea54f76dad..ba4e071ca1 100644 --- a/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_relctor_recurse.csproj @@ -34,13 +34,16 @@ <Compile Include="ctor_recurse.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj b/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj index afb7ee09ce..609f3d8722 100644 --- a/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_relhan2.csproj @@ -34,13 +34,16 @@ <Compile Include="han2.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj b/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj index b5558212a2..e8ad08f3c3 100644 --- a/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_relhan3.csproj @@ -34,13 +34,16 @@ <Compile Include="han3.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj b/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj index e8f17f4166..76afc1b4f4 100644 --- a/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_relhan3_ctor.csproj @@ -34,13 +34,16 @@ <Compile Include="han3_ctor.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj b/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj index 43ee2995ad..3912151001 100644 --- a/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_relhan3_ref.csproj @@ -34,13 +34,16 @@ <Compile Include="han3_ref.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj b/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj index 354a51c20f..5b3d75f348 100644 --- a/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_relhanoi.csproj @@ -34,13 +34,16 @@ <Compile Include="hanoi.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_relknight.csproj b/tests/src/JIT/Methodical/VT/etc/_relknight.csproj index b9598ebb09..8392e80786 100644 --- a/tests/src/JIT/Methodical/VT/etc/_relknight.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_relknight.csproj @@ -34,13 +34,16 @@ <Compile Include="knight.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj index 8a1e5c3f22..7458bfc1f4 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbgctor_recurse.csproj @@ -34,13 +34,16 @@ <Compile Include="ctor_recurse.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj index 65dfd18c78..ca9de49621 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan2.csproj @@ -34,13 +34,16 @@ <Compile Include="han2.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj index c6d7293d8b..076338b1ad 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3.csproj @@ -34,13 +34,16 @@ <Compile Include="han3.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj index 09d59bd636..8b2533c112 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ctor.csproj @@ -34,13 +34,16 @@ <Compile Include="han3_ctor.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj index cabb7a559a..9b47f17668 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbghan3_ref.csproj @@ -34,13 +34,16 @@ <Compile Include="han3_ref.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj index 811ea2c69b..3150d2beca 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbghanoi.csproj @@ -34,13 +34,16 @@ <Compile Include="hanoi.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj index d9c1149872..4e8c992378 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_dbgknight.csproj @@ -34,13 +34,16 @@ <Compile Include="knight.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj index 8a1e5c3f22..7458bfc1f4 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_relctor_recurse.csproj @@ -34,13 +34,16 @@ <Compile Include="ctor_recurse.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj index 65dfd18c78..ca9de49621 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_relhan2.csproj @@ -34,13 +34,16 @@ <Compile Include="han2.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj index c6d7293d8b..076338b1ad 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3.csproj @@ -34,13 +34,16 @@ <Compile Include="han3.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj index 09d59bd636..8b2533c112 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ctor.csproj @@ -34,13 +34,16 @@ <Compile Include="han3_ctor.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj index cabb7a559a..9b47f17668 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_relhan3_ref.csproj @@ -34,13 +34,16 @@ <Compile Include="han3_ref.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj index 811ea2c69b..3150d2beca 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_relhanoi.csproj @@ -34,13 +34,16 @@ <Compile Include="hanoi.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj b/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj index d9c1149872..4e8c992378 100644 --- a/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj +++ b/tests/src/JIT/Methodical/VT/etc/_speed_relknight.csproj @@ -34,13 +34,16 @@ <Compile Include="knight.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj b/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj index d6b88c53ca..a3a371bb2f 100644 --- a/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/gc_nested.csproj @@ -39,6 +39,9 @@ <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/nested.csproj b/tests/src/JIT/Methodical/VT/etc/nested.csproj index bee15b77c1..580a40b498 100644 --- a/tests/src/JIT/Methodical/VT/etc/nested.csproj +++ b/tests/src/JIT/Methodical/VT/etc/nested.csproj @@ -34,12 +34,15 @@ <Compile Include="nested.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> diff --git a/tests/src/JIT/Methodical/VT/etc/packages.config b/tests/src/JIT/Methodical/VT/etc/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/Methodical/VT/etc/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> -</packages>
\ No newline at end of file diff --git a/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj b/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj index 038988e641..e58c1e7d9b 100644 --- a/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj +++ b/tests/src/JIT/Methodical/VT/identity/_dbgaccum.csproj @@ -34,13 +34,16 @@ <Compile Include="accum.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj b/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj index 491662cd48..36b9f2d5e9 100644 --- a/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj +++ b/tests/src/JIT/Methodical/VT/identity/_dbgvcall.csproj @@ -34,13 +34,16 @@ <Compile Include="vcall.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj b/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj index 038988e641..e58c1e7d9b 100644 --- a/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj +++ b/tests/src/JIT/Methodical/VT/identity/_relaccum.csproj @@ -34,13 +34,16 @@ <Compile Include="accum.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj b/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj index 491662cd48..36b9f2d5e9 100644 --- a/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj +++ b/tests/src/JIT/Methodical/VT/identity/_relvcall.csproj @@ -34,13 +34,16 @@ <Compile Include="vcall.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj b/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj index 9d3b16f392..caeecbc4e2 100644 --- a/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj +++ b/tests/src/JIT/Methodical/VT/identity/_speed_dbgaccum.csproj @@ -34,13 +34,16 @@ <Compile Include="accum.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj b/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj index 0e4ec172d9..6d6ea5fc82 100644 --- a/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj +++ b/tests/src/JIT/Methodical/VT/identity/_speed_dbgvcall.csproj @@ -34,13 +34,16 @@ <Compile Include="vcall.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj b/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj index 9d3b16f392..caeecbc4e2 100644 --- a/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj +++ b/tests/src/JIT/Methodical/VT/identity/_speed_relaccum.csproj @@ -34,13 +34,16 @@ <Compile Include="accum.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj b/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj index 0e4ec172d9..6d6ea5fc82 100644 --- a/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj +++ b/tests/src/JIT/Methodical/VT/identity/_speed_relvcall.csproj @@ -34,13 +34,16 @@ <Compile Include="vcall.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/identity/packages.config b/tests/src/JIT/Methodical/VT/identity/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/Methodical/VT/identity/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> -</packages>
\ No newline at end of file diff --git a/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj b/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj index f99e36e4cc..6401f8a21b 100644 --- a/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj +++ b/tests/src/JIT/Methodical/VT/port/_dbglcs.csproj @@ -34,13 +34,16 @@ <Compile Include="lcs.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj b/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj index f722808240..30f481a220 100644 --- a/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj +++ b/tests/src/JIT/Methodical/VT/port/_dbglcs_gcref.csproj @@ -34,13 +34,16 @@ <Compile Include="lcs_gcref.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/port/_rellcs.csproj b/tests/src/JIT/Methodical/VT/port/_rellcs.csproj index f99e36e4cc..6401f8a21b 100644 --- a/tests/src/JIT/Methodical/VT/port/_rellcs.csproj +++ b/tests/src/JIT/Methodical/VT/port/_rellcs.csproj @@ -34,13 +34,16 @@ <Compile Include="lcs.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj b/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj index f722808240..30f481a220 100644 --- a/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj +++ b/tests/src/JIT/Methodical/VT/port/_rellcs_gcref.csproj @@ -34,13 +34,16 @@ <Compile Include="lcs_gcref.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj b/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj index bee7bc8cfd..88a0be13fa 100644 --- a/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj +++ b/tests/src/JIT/Methodical/VT/port/_speed_dbglcs.csproj @@ -34,13 +34,16 @@ <Compile Include="lcs.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj b/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj index eef2d54dea..f755f58a1e 100644 --- a/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj +++ b/tests/src/JIT/Methodical/VT/port/_speed_dbglcs_gcref.csproj @@ -34,13 +34,16 @@ <Compile Include="lcs_gcref.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj b/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj index bee7bc8cfd..88a0be13fa 100644 --- a/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj +++ b/tests/src/JIT/Methodical/VT/port/_speed_rellcs.csproj @@ -34,13 +34,16 @@ <Compile Include="lcs.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj b/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj index eef2d54dea..f755f58a1e 100644 --- a/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj +++ b/tests/src/JIT/Methodical/VT/port/_speed_rellcs_gcref.csproj @@ -34,13 +34,16 @@ <Compile Include="lcs_gcref.cs" /> </ItemGroup> <ItemGroup> - <None Include="packages.config" /> + <None Include="$(JitPackagesConfigFileDirectory)minimal.packages.config" /> <None Include="app.config" /> </ItemGroup> <ItemGroup> <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" /> </ItemGroup> + <PropertyGroup> + <PackagesConfigFile>$(JitPackagesConfigFileDirectory)minimal.packages.config</PackagesConfigFile> + </PropertyGroup> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> <PropertyGroup Condition=" '$(MsBuildProjectDirOverride)' != '' "> </PropertyGroup> -</Project>
\ No newline at end of file +</Project> diff --git a/tests/src/JIT/Methodical/VT/port/packages.config b/tests/src/JIT/Methodical/VT/port/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/Methodical/VT/port/packages.config +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.Console" version="4.0.0-beta-22405" /> - <package id="System.Runtime" version="4.0.20-beta-22405" /> - <package id="System.Runtime.Extensions" version="4.0.10-beta-22412" /> -</packages>
\ No newline at end of file |