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/jit64/opt | |
| 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/jit64/opt')
83 files changed, 350 insertions, 218 deletions
diff --git a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj index be03ae54a7..e5fce4d454 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_d.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseAAA.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/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj index 35642350c7..46f582d6c0 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_do.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseAAA.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/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj index be03ae54a7..e5fce4d454 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_r.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseAAA.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/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj index 35642350c7..46f582d6c0 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAA_ro.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseAAA.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/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj index 8ef0890749..74f4491a5a 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_d.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseAAC.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/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj index 83761682bd..c6c238b072 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_do.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseAAC.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/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj index 8ef0890749..74f4491a5a 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_r.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseAAC.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/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj index 83761682bd..c6c238b072 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseAAC_ro.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseAAC.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/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj index e939657423..1f8ded614f 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_d.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseACA.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/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj index aa0f4203fd..97b082cc54 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_do.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseACA.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/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj index e939657423..1f8ded614f 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_r.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseACA.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/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj index aa0f4203fd..97b082cc54 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACA_ro.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseACA.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/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj index 9a127f0370..cca37f05e9 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_d.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseACC.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/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj index 39880618ba..6e6bf2a758 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_do.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseACC.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/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj index 9a127f0370..cca37f05e9 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_r.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseACC.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/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj index 39880618ba..6e6bf2a758 100644 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj +++ b/tests/src/JIT/jit64/opt/cg/CGRecurse/CGRecurseACC_ro.csproj @@ -34,13 +34,16 @@ <Compile Include="CGRecurseACC.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/jit64/opt/cg/CGRecurse/packages.config b/tests/src/JIT/jit64/opt/cg/CGRecurse/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/jit64/opt/cg/CGRecurse/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/jit64/opt/cg/cgstress/CgStress1_d.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj index 0871f0c952..a701cb0efd 100644 --- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj +++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_d.csproj @@ -34,13 +34,16 @@ <Compile Include="CgStress1.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/jit64/opt/cg/cgstress/CgStress1_do.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj index 718c43d35b..a57b6ce2fb 100644 --- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj +++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_do.csproj @@ -34,13 +34,16 @@ <Compile Include="CgStress1.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/jit64/opt/cg/cgstress/CgStress1_r.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj index 0871f0c952..a701cb0efd 100644 --- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj +++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_r.csproj @@ -34,13 +34,16 @@ <Compile Include="CgStress1.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/jit64/opt/cg/cgstress/CgStress1_ro.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj index 718c43d35b..a57b6ce2fb 100644 --- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj +++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress1_ro.csproj @@ -34,13 +34,16 @@ <Compile Include="CgStress1.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/jit64/opt/cg/cgstress/CgStress2_d.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj index 466c3c2756..ff10994a87 100644 --- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj +++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_d.csproj @@ -34,13 +34,16 @@ <Compile Include="CgStress2.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/jit64/opt/cg/cgstress/CgStress2_do.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj index 7a7ec0ba52..e87c907852 100644 --- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj +++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_do.csproj @@ -34,13 +34,16 @@ <Compile Include="CgStress2.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/jit64/opt/cg/cgstress/CgStress2_r.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj index 466c3c2756..ff10994a87 100644 --- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj +++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_r.csproj @@ -34,13 +34,16 @@ <Compile Include="CgStress2.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/jit64/opt/cg/cgstress/CgStress2_ro.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj index 7a7ec0ba52..e87c907852 100644 --- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj +++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress2_ro.csproj @@ -34,13 +34,16 @@ <Compile Include="CgStress2.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/jit64/opt/cg/cgstress/CgStress3_d.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj index 624ad60352..5e2ba333db 100644 --- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj +++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_d.csproj @@ -34,13 +34,16 @@ <Compile Include="CgStress3.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/jit64/opt/cg/cgstress/CgStress3_do.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj index 12d4230e20..8d6a961b6c 100644 --- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj +++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_do.csproj @@ -34,13 +34,16 @@ <Compile Include="CgStress3.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/jit64/opt/cg/cgstress/CgStress3_r.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj index 624ad60352..5e2ba333db 100644 --- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj +++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_r.csproj @@ -34,13 +34,16 @@ <Compile Include="CgStress3.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/jit64/opt/cg/cgstress/CgStress3_ro.csproj b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj index 12d4230e20..8d6a961b6c 100644 --- a/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj +++ b/tests/src/JIT/jit64/opt/cg/cgstress/CgStress3_ro.csproj @@ -34,13 +34,16 @@ <Compile Include="CgStress3.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/jit64/opt/cg/cgstress/packages.config b/tests/src/JIT/jit64/opt/cg/cgstress/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/jit64/opt/cg/cgstress/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/jit64/opt/cg/il/packages.config b/tests/src/JIT/jit64/opt/cg/il/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/jit64/opt/cg/il/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/jit64/opt/cprop/packages.config b/tests/src/JIT/jit64/opt/cprop/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/jit64/opt/cprop/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/jit64/opt/cse/HugeArray.csproj b/tests/src/JIT/jit64/opt/cse/HugeArray.csproj index f0bf54e0cf..db9dfe676e 100644 --- a/tests/src/JIT/jit64/opt/cse/HugeArray.csproj +++ b/tests/src/JIT/jit64/opt/cse/HugeArray.csproj @@ -34,13 +34,16 @@ <Compile Include="HugeArray.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/jit64/opt/cse/HugeArray1.csproj b/tests/src/JIT/jit64/opt/cse/HugeArray1.csproj index 0c13904a28..0cf5adba26 100644 --- a/tests/src/JIT/jit64/opt/cse/HugeArray1.csproj +++ b/tests/src/JIT/jit64/opt/cse/HugeArray1.csproj @@ -34,13 +34,16 @@ <Compile Include="HugeArray1.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/jit64/opt/cse/HugeField1.csproj b/tests/src/JIT/jit64/opt/cse/HugeField1.csproj index 502c2d91bb..5c303646be 100644 --- a/tests/src/JIT/jit64/opt/cse/HugeField1.csproj +++ b/tests/src/JIT/jit64/opt/cse/HugeField1.csproj @@ -34,13 +34,16 @@ <Compile Include="HugeField1.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/jit64/opt/cse/HugeField2.csproj b/tests/src/JIT/jit64/opt/cse/HugeField2.csproj index cbf959ba78..1395406369 100644 --- a/tests/src/JIT/jit64/opt/cse/HugeField2.csproj +++ b/tests/src/JIT/jit64/opt/cse/HugeField2.csproj @@ -34,13 +34,16 @@ <Compile Include="HugeField2.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/jit64/opt/cse/arrayexpr1.csproj b/tests/src/JIT/jit64/opt/cse/arrayexpr1.csproj index 3f1fcb2f7a..7c513c81bc 100644 --- a/tests/src/JIT/jit64/opt/cse/arrayexpr1.csproj +++ b/tests/src/JIT/jit64/opt/cse/arrayexpr1.csproj @@ -33,13 +33,16 @@ <Compile Include="arrayexpr1.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/jit64/opt/cse/arrayexpr2_r.csproj b/tests/src/JIT/jit64/opt/cse/arrayexpr2_r.csproj index a875f620f3..77a765796d 100644 --- a/tests/src/JIT/jit64/opt/cse/arrayexpr2_r.csproj +++ b/tests/src/JIT/jit64/opt/cse/arrayexpr2_r.csproj @@ -34,13 +34,16 @@ <Compile Include="arrayexpr2.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/jit64/opt/cse/fieldExprUnchecked1.csproj b/tests/src/JIT/jit64/opt/cse/fieldExprUnchecked1.csproj index 1032fc08bf..a81a136190 100644 --- a/tests/src/JIT/jit64/opt/cse/fieldExprUnchecked1.csproj +++ b/tests/src/JIT/jit64/opt/cse/fieldExprUnchecked1.csproj @@ -33,13 +33,16 @@ <Compile Include="fieldExprUnchecked1.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/jit64/opt/cse/fieldexpr1.csproj b/tests/src/JIT/jit64/opt/cse/fieldexpr1.csproj index 8d704531c4..7dacecf100 100644 --- a/tests/src/JIT/jit64/opt/cse/fieldexpr1.csproj +++ b/tests/src/JIT/jit64/opt/cse/fieldexpr1.csproj @@ -33,13 +33,16 @@ <Compile Include="fieldexpr1.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/jit64/opt/cse/fieldexpr1_1.csproj b/tests/src/JIT/jit64/opt/cse/fieldexpr1_1.csproj index 85e897d46c..1b3ce4b8d7 100644 --- a/tests/src/JIT/jit64/opt/cse/fieldexpr1_1.csproj +++ b/tests/src/JIT/jit64/opt/cse/fieldexpr1_1.csproj @@ -33,13 +33,16 @@ <Compile Include="fieldexpr1_1.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/jit64/opt/cse/fieldexpr2.csproj b/tests/src/JIT/jit64/opt/cse/fieldexpr2.csproj index 5c64c0dad0..d536c5771c 100644 --- a/tests/src/JIT/jit64/opt/cse/fieldexpr2.csproj +++ b/tests/src/JIT/jit64/opt/cse/fieldexpr2.csproj @@ -33,13 +33,16 @@ <Compile Include="fieldexpr2.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/jit64/opt/cse/hugeSimpleExpr1.csproj b/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj index 5b9731f30b..b95b4b56c4 100644 --- a/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj +++ b/tests/src/JIT/jit64/opt/cse/hugeSimpleExpr1.csproj @@ -34,13 +34,16 @@ <Compile Include="hugeSimpleExpr1.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/jit64/opt/cse/hugeexpr1.csproj b/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj index 5c0f669967..bfa4b1a434 100644 --- a/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj +++ b/tests/src/JIT/jit64/opt/cse/hugeexpr1.csproj @@ -34,13 +34,16 @@ <Compile Include="hugeexpr1.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/jit64/opt/cse/mixedexpr1_r.csproj b/tests/src/JIT/jit64/opt/cse/mixedexpr1_r.csproj index 467abbf041..232f6de612 100644 --- a/tests/src/JIT/jit64/opt/cse/mixedexpr1_r.csproj +++ b/tests/src/JIT/jit64/opt/cse/mixedexpr1_r.csproj @@ -34,13 +34,16 @@ <Compile Include="mixedexpr1.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/jit64/opt/cse/packages.config b/tests/src/JIT/jit64/opt/cse/packages.config deleted file mode 100644 index 06d3d11ead..0000000000 --- a/tests/src/JIT/jit64/opt/cse/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> diff --git a/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj b/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj index 7d5a74b051..c1195b9fae 100644 --- a/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj +++ b/tests/src/JIT/jit64/opt/cse/pointerexpr1.csproj @@ -34,13 +34,16 @@ <Compile Include="pointerexpr1.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/jit64/opt/cse/pointerexpr1_1.csproj b/tests/src/JIT/jit64/opt/cse/pointerexpr1_1.csproj index 513d3c6aad..26c7e72059 100644 --- a/tests/src/JIT/jit64/opt/cse/pointerexpr1_1.csproj +++ b/tests/src/JIT/jit64/opt/cse/pointerexpr1_1.csproj @@ -34,13 +34,16 @@ <Compile Include="pointerexpr1_1.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/jit64/opt/cse/simpleexpr1.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr1.csproj index 686bd9d987..05a7c5afc9 100644 --- a/tests/src/JIT/jit64/opt/cse/simpleexpr1.csproj +++ b/tests/src/JIT/jit64/opt/cse/simpleexpr1.csproj @@ -33,13 +33,16 @@ <Compile Include="simpleexpr1.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/jit64/opt/cse/simpleexpr1_1.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr1_1.csproj index 7d388bf99f..05e52300ca 100644 --- a/tests/src/JIT/jit64/opt/cse/simpleexpr1_1.csproj +++ b/tests/src/JIT/jit64/opt/cse/simpleexpr1_1.csproj @@ -33,13 +33,16 @@ <Compile Include="simpleexpr1_1.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/jit64/opt/cse/simpleexpr2.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr2.csproj index 04baa9270f..61ca082590 100644 --- a/tests/src/JIT/jit64/opt/cse/simpleexpr2.csproj +++ b/tests/src/JIT/jit64/opt/cse/simpleexpr2.csproj @@ -33,13 +33,16 @@ <Compile Include="simpleexpr2.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/jit64/opt/cse/simpleexpr3.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr3.csproj index 2867cf6cc3..456ce4a399 100644 --- a/tests/src/JIT/jit64/opt/cse/simpleexpr3.csproj +++ b/tests/src/JIT/jit64/opt/cse/simpleexpr3.csproj @@ -33,13 +33,16 @@ <Compile Include="simpleexpr3.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/jit64/opt/cse/simpleexpr4_r.csproj b/tests/src/JIT/jit64/opt/cse/simpleexpr4_r.csproj index d3e3d57323..550c1ac1fb 100644 --- a/tests/src/JIT/jit64/opt/cse/simpleexpr4_r.csproj +++ b/tests/src/JIT/jit64/opt/cse/simpleexpr4_r.csproj @@ -34,13 +34,16 @@ <Compile Include="simpleexpr4.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/jit64/opt/cse/staticFieldExpr1_1.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_1.csproj index 86f46b7de3..85a3673438 100644 --- a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_1.csproj +++ b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_1.csproj @@ -33,13 +33,16 @@ <Compile Include="staticFieldExpr1_1.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/jit64/opt/cse/staticFieldExpr1_r.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r.csproj index 95f3454ce5..453af3abba 100644 --- a/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r.csproj +++ b/tests/src/JIT/jit64/opt/cse/staticFieldExpr1_r.csproj @@ -34,13 +34,16 @@ <Compile Include="staticFieldExpr1.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/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj index 1c78f7de56..7fa25a5bbf 100644 --- a/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj +++ b/tests/src/JIT/jit64/opt/cse/staticFieldExprUnchecked1_r.csproj @@ -34,13 +34,16 @@ <Compile Include="staticFieldExprUnchecked1.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/jit64/opt/cse/volatilefield.csproj b/tests/src/JIT/jit64/opt/cse/volatilefield.csproj index ff74760290..40c263b3af 100644 --- a/tests/src/JIT/jit64/opt/cse/volatilefield.csproj +++ b/tests/src/JIT/jit64/opt/cse/volatilefield.csproj @@ -33,13 +33,16 @@ <Compile Include="volatilefield.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/jit64/opt/cse/volatilestaticfield.csproj b/tests/src/JIT/jit64/opt/cse/volatilestaticfield.csproj index 2e4294c728..b81277aea0 100644 --- a/tests/src/JIT/jit64/opt/cse/volatilestaticfield.csproj +++ b/tests/src/JIT/jit64/opt/cse/volatilestaticfield.csproj @@ -33,13 +33,16 @@ <Compile Include="volatilestaticfield.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/jit64/opt/inl/caninline_d.csproj b/tests/src/JIT/jit64/opt/inl/caninline_d.csproj index 237ef53dae..12ae45cf87 100644 --- a/tests/src/JIT/jit64/opt/inl/caninline_d.csproj +++ b/tests/src/JIT/jit64/opt/inl/caninline_d.csproj @@ -34,13 +34,16 @@ <Compile Include="caninline.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/jit64/opt/inl/caninline_do.csproj b/tests/src/JIT/jit64/opt/inl/caninline_do.csproj index e68f25c00b..1453d9ec1a 100644 --- a/tests/src/JIT/jit64/opt/inl/caninline_do.csproj +++ b/tests/src/JIT/jit64/opt/inl/caninline_do.csproj @@ -34,13 +34,16 @@ <Compile Include="caninline.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/jit64/opt/inl/caninline_r.csproj b/tests/src/JIT/jit64/opt/inl/caninline_r.csproj index 237ef53dae..12ae45cf87 100644 --- a/tests/src/JIT/jit64/opt/inl/caninline_r.csproj +++ b/tests/src/JIT/jit64/opt/inl/caninline_r.csproj @@ -34,13 +34,16 @@ <Compile Include="caninline.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/jit64/opt/inl/caninline_ro.csproj b/tests/src/JIT/jit64/opt/inl/caninline_ro.csproj index e68f25c00b..1453d9ec1a 100644 --- a/tests/src/JIT/jit64/opt/inl/caninline_ro.csproj +++ b/tests/src/JIT/jit64/opt/inl/caninline_ro.csproj @@ -34,13 +34,16 @@ <Compile Include="caninline.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/jit64/opt/inl/packages.config b/tests/src/JIT/jit64/opt/inl/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/jit64/opt/inl/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/jit64/opt/lim/lim_002.csproj b/tests/src/JIT/jit64/opt/lim/lim_002.csproj index 64b935233e..dad602f12a 100644 --- a/tests/src/JIT/jit64/opt/lim/lim_002.csproj +++ b/tests/src/JIT/jit64/opt/lim/lim_002.csproj @@ -33,13 +33,16 @@ <Compile Include="lim_002.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/jit64/opt/lim/packages.config b/tests/src/JIT/jit64/opt/lim/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/jit64/opt/lim/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/jit64/opt/lur/lur_02.csproj b/tests/src/JIT/jit64/opt/lur/lur_02.csproj index 3824970518..fe44bf944b 100644 --- a/tests/src/JIT/jit64/opt/lur/lur_02.csproj +++ b/tests/src/JIT/jit64/opt/lur/lur_02.csproj @@ -33,13 +33,16 @@ <Compile Include="lur_02.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/jit64/opt/lur/packages.config b/tests/src/JIT/jit64/opt/lur/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/jit64/opt/lur/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/jit64/opt/osr/osr001.csproj b/tests/src/JIT/jit64/opt/osr/osr001.csproj index 2c75d66b5c..f28d52f403 100644 --- a/tests/src/JIT/jit64/opt/osr/osr001.csproj +++ b/tests/src/JIT/jit64/opt/osr/osr001.csproj @@ -33,13 +33,16 @@ <Compile Include="osr001.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/jit64/opt/osr/packages.config b/tests/src/JIT/jit64/opt/osr/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/jit64/opt/osr/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/jit64/opt/regress/vswhidbey/223862/packages.config b/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/jit64/opt/regress/vswhidbey/223862/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/jit64/opt/regress/vswhidbey/228572/packages.config b/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/jit64/opt/regress/vswhidbey/228572/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/jit64/opt/regress/vswhidbey/481244/packages.config b/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/jit64/opt/regress/vswhidbey/481244/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/jit64/opt/rngchk/ArrayBound_o.csproj b/tests/src/JIT/jit64/opt/rngchk/ArrayBound_o.csproj index b1f7abcdd4..ba164c597f 100644 --- a/tests/src/JIT/jit64/opt/rngchk/ArrayBound_o.csproj +++ b/tests/src/JIT/jit64/opt/rngchk/ArrayBound_o.csproj @@ -34,13 +34,16 @@ <Compile Include="ArrayBound.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/jit64/opt/rngchk/ArrayWith2Loops_o.csproj b/tests/src/JIT/jit64/opt/rngchk/ArrayWith2Loops_o.csproj index 3e7a7a919e..4c2c5998cc 100644 --- a/tests/src/JIT/jit64/opt/rngchk/ArrayWith2Loops_o.csproj +++ b/tests/src/JIT/jit64/opt/rngchk/ArrayWith2Loops_o.csproj @@ -34,13 +34,16 @@ <Compile Include="ArrayWith2Loops.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/jit64/opt/rngchk/ArrayWithFunc_o.csproj b/tests/src/JIT/jit64/opt/rngchk/ArrayWithFunc_o.csproj index 07da6e8858..023b0cb401 100644 --- a/tests/src/JIT/jit64/opt/rngchk/ArrayWithFunc_o.csproj +++ b/tests/src/JIT/jit64/opt/rngchk/ArrayWithFunc_o.csproj @@ -34,13 +34,16 @@ <Compile Include="ArrayWithFunc.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/jit64/opt/rngchk/BadMatrixMul_o.csproj b/tests/src/JIT/jit64/opt/rngchk/BadMatrixMul_o.csproj index 4795446603..a1be555a9a 100644 --- a/tests/src/JIT/jit64/opt/rngchk/BadMatrixMul_o.csproj +++ b/tests/src/JIT/jit64/opt/rngchk/BadMatrixMul_o.csproj @@ -34,13 +34,16 @@ <Compile Include="BadMatrixMul.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/jit64/opt/rngchk/JaggedArray_o.csproj b/tests/src/JIT/jit64/opt/rngchk/JaggedArray_o.csproj index 1ce8ef5ced..eb53cd602f 100644 --- a/tests/src/JIT/jit64/opt/rngchk/JaggedArray_o.csproj +++ b/tests/src/JIT/jit64/opt/rngchk/JaggedArray_o.csproj @@ -34,13 +34,16 @@ <Compile Include="JaggedArray.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/jit64/opt/rngchk/MatrixMul_o.csproj b/tests/src/JIT/jit64/opt/rngchk/MatrixMul_o.csproj index aa89921887..0f1f2a15e2 100644 --- a/tests/src/JIT/jit64/opt/rngchk/MatrixMul_o.csproj +++ b/tests/src/JIT/jit64/opt/rngchk/MatrixMul_o.csproj @@ -34,13 +34,16 @@ <Compile Include="MatrixMul.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/jit64/opt/rngchk/RngchkStress1_o.csproj b/tests/src/JIT/jit64/opt/rngchk/RngchkStress1_o.csproj index 27d9af20fa..c51959cc20 100644 --- a/tests/src/JIT/jit64/opt/rngchk/RngchkStress1_o.csproj +++ b/tests/src/JIT/jit64/opt/rngchk/RngchkStress1_o.csproj @@ -34,13 +34,16 @@ <Compile Include="RngchkStress1.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/jit64/opt/rngchk/RngchkStress2_o.csproj b/tests/src/JIT/jit64/opt/rngchk/RngchkStress2_o.csproj index b9b7a5558c..a918c0220f 100644 --- a/tests/src/JIT/jit64/opt/rngchk/RngchkStress2_o.csproj +++ b/tests/src/JIT/jit64/opt/rngchk/RngchkStress2_o.csproj @@ -34,13 +34,16 @@ <Compile Include="RngchkStress2.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/jit64/opt/rngchk/RngchkStress3.csproj b/tests/src/JIT/jit64/opt/rngchk/RngchkStress3.csproj index d3b3663bb8..16ea538e6e 100644 --- a/tests/src/JIT/jit64/opt/rngchk/RngchkStress3.csproj +++ b/tests/src/JIT/jit64/opt/rngchk/RngchkStress3.csproj @@ -34,13 +34,16 @@ <Compile Include="RngchkStress3.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/jit64/opt/rngchk/SimpleArray_01_o.csproj b/tests/src/JIT/jit64/opt/rngchk/SimpleArray_01_o.csproj index 30e854bce6..5e86c2b868 100644 --- a/tests/src/JIT/jit64/opt/rngchk/SimpleArray_01_o.csproj +++ b/tests/src/JIT/jit64/opt/rngchk/SimpleArray_01_o.csproj @@ -34,13 +34,16 @@ <Compile Include="SimpleArray_01.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/jit64/opt/rngchk/packages.config b/tests/src/JIT/jit64/opt/rngchk/packages.config deleted file mode 100644 index c5ec75f145..0000000000 --- a/tests/src/JIT/jit64/opt/rngchk/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> |