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/AsgOp/i4 | |
| 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/AsgOp/i4')
9 files changed, 40 insertions, 22 deletions
diff --git a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj index ec9ea78b39..b9a90a8fad 100644 --- a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj +++ b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_d.csproj @@ -34,13 +34,16 @@ <Compile Include="i4.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/AsgOp/i4/i4_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj index 15e0d4d597..0c240357a1 100644 --- a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj +++ b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_do.csproj @@ -34,13 +34,16 @@ <Compile Include="i4.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/AsgOp/i4/i4_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj index ec9ea78b39..b9a90a8fad 100644 --- a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj +++ b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_r.csproj @@ -34,13 +34,16 @@ <Compile Include="i4.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/AsgOp/i4/i4_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj index 15e0d4d597..0c240357a1 100644 --- a/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj +++ b/tests/src/JIT/Methodical/AsgOp/i4/i4_cs_ro.csproj @@ -34,13 +34,16 @@ <Compile Include="i4.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/AsgOp/i4/i4flat_cs_d.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj index a8ed79f294..fc488ce0c7 100644 --- a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj +++ b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_d.csproj @@ -34,13 +34,16 @@ <Compile Include="i4flat.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/AsgOp/i4/i4flat_cs_do.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj index 2cc2f5b1b4..d892774aa0 100644 --- a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj +++ b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_do.csproj @@ -34,13 +34,16 @@ <Compile Include="i4flat.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/AsgOp/i4/i4flat_cs_r.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj index a8ed79f294..fc488ce0c7 100644 --- a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj +++ b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_r.csproj @@ -34,13 +34,16 @@ <Compile Include="i4flat.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/AsgOp/i4/i4flat_cs_ro.csproj b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj index 2cc2f5b1b4..d892774aa0 100644 --- a/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj +++ b/tests/src/JIT/Methodical/AsgOp/i4/i4flat_cs_ro.csproj @@ -34,13 +34,16 @@ <Compile Include="i4flat.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/AsgOp/i4/packages.config b/tests/src/JIT/Methodical/AsgOp/i4/packages.config deleted file mode 100644 index 37e10b961a..0000000000 --- a/tests/src/JIT/Methodical/AsgOp/i4/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 |