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/Arrays/lcs | |
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/Arrays/lcs')
33 files changed, 160 insertions, 70 deletions
diff --git a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs.csproj index f99e36e4cc..6401f8a21b 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_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/Arrays/lcs/_dbglcs2.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs2.csproj index 52315dd6d3..1cd08240e3 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs2.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcs2.csproj @@ -34,13 +34,16 @@ <Compile Include="lcs2.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/Arrays/lcs/_dbglcsbas.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbas.csproj index 1d7984d756..d8b7cb97e8 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbas.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbas.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsbas.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/Arrays/lcs/_dbglcsbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbox.csproj index d527710d7f..c8104a78a8 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbox.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsbox.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsbox.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/Arrays/lcs/_dbglcsmax.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmax.csproj index a52bef40a0..8802638318 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmax.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmax.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsmax.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/Arrays/lcs/_dbglcsmixed.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmixed.csproj index f002ba8ebd..d5f8497a4d 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmixed.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsmixed.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsmixed.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/Arrays/lcs/_dbglcsval.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsval.csproj index aabda1ef83..18232f021f 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsval.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsval.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsval.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/Arrays/lcs/_dbglcsvalbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsvalbox.csproj index 83d3d435fa..c0ff58b608 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsvalbox.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_dbglcsvalbox.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsvalbox.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/Arrays/lcs/_rellcs.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcs.csproj index f99e36e4cc..6401f8a21b 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcs.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_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/Arrays/lcs/_rellcs2.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcs2.csproj index 52315dd6d3..1cd08240e3 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcs2.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcs2.csproj @@ -34,13 +34,16 @@ <Compile Include="lcs2.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/Arrays/lcs/_rellcsbas.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbas.csproj index 1d7984d756..d8b7cb97e8 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbas.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbas.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsbas.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/Arrays/lcs/_rellcsbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbox.csproj index d527710d7f..c8104a78a8 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbox.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsbox.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsbox.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/Arrays/lcs/_rellcsmax.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmax.csproj index a52bef40a0..8802638318 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmax.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmax.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsmax.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/Arrays/lcs/_rellcsmixed.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmixed.csproj index f002ba8ebd..d5f8497a4d 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmixed.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsmixed.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsmixed.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/Arrays/lcs/_rellcsval.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsval.csproj index aabda1ef83..18232f021f 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsval.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsval.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsval.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/Arrays/lcs/_rellcsvalbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsvalbox.csproj index 83d3d435fa..c0ff58b608 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_rellcsvalbox.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_rellcsvalbox.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsvalbox.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/Arrays/lcs/_speed_dbglcs.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs.csproj index bee7bc8cfd..88a0be13fa 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_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/Arrays/lcs/_speed_dbglcs2.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs2.csproj index 902b3c7c44..076530f070 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs2.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcs2.csproj @@ -34,13 +34,16 @@ <Compile Include="lcs2.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/Arrays/lcs/_speed_dbglcsbas.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbas.csproj index 8f629bc680..8ccc3df74e 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbas.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbas.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsbas.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/Arrays/lcs/_speed_dbglcsbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbox.csproj index fa5513efb1..b81374a25d 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbox.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsbox.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsbox.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/Arrays/lcs/_speed_dbglcsmax.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmax.csproj index 3e4366628f..97e14b09a0 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmax.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmax.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsmax.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/Arrays/lcs/_speed_dbglcsmixed.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmixed.csproj index 41b6ebdf0c..23983f9f2d 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmixed.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsmixed.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsmixed.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/Arrays/lcs/_speed_dbglcsval.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsval.csproj index 6d6011dee1..c2a4d7d70c 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsval.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsval.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsval.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/Arrays/lcs/_speed_dbglcsvalbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsvalbox.csproj index c3d9f89b69..1bfee5659d 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsvalbox.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_dbglcsvalbox.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsvalbox.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/Arrays/lcs/_speed_rellcs.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs.csproj index bee7bc8cfd..88a0be13fa 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_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/Arrays/lcs/_speed_rellcs2.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs2.csproj index 902b3c7c44..076530f070 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs2.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcs2.csproj @@ -34,13 +34,16 @@ <Compile Include="lcs2.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/Arrays/lcs/_speed_rellcsbas.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbas.csproj index 8f629bc680..8ccc3df74e 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbas.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbas.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsbas.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/Arrays/lcs/_speed_rellcsbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbox.csproj index fa5513efb1..b81374a25d 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbox.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsbox.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsbox.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/Arrays/lcs/_speed_rellcsmax.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmax.csproj index 3e4366628f..97e14b09a0 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmax.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmax.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsmax.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/Arrays/lcs/_speed_rellcsmixed.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmixed.csproj index 41b6ebdf0c..23983f9f2d 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmixed.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsmixed.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsmixed.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/Arrays/lcs/_speed_rellcsval.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsval.csproj index 6d6011dee1..c2a4d7d70c 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsval.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsval.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsval.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/Arrays/lcs/_speed_rellcsvalbox.csproj b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsvalbox.csproj index c3d9f89b69..1bfee5659d 100644 --- a/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsvalbox.csproj +++ b/tests/src/JIT/Methodical/Arrays/lcs/_speed_rellcsvalbox.csproj @@ -34,13 +34,16 @@ <Compile Include="lcsvalbox.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/Arrays/lcs/packages.config b/tests/src/JIT/Methodical/Arrays/lcs/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/Methodical/Arrays/lcs/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 |