diff options
| author | bradwilson <dotnetguy@gmail.com> | 2012-07-18 23:00:43 +0400 |
|---|---|---|
| committer | bradwilson <dotnetguy@gmail.com> | 2012-07-18 23:09:02 +0400 |
| commit | eecfe803d31d887a2ee54cbce95d23721103f911 (patch) | |
| tree | 7089f90498bcea1e52a6fa86d6bc2ab697b6aa93 /Runtime.msbuild | |
| parent | 44b53cd4dd84db8c47e00397de7538ac29f7b4f8 (diff) | |
Tweak package restore algorithm
Diffstat (limited to 'Runtime.msbuild')
| -rw-r--r-- | Runtime.msbuild | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/Runtime.msbuild b/Runtime.msbuild index 0ae2a8b4..2b72d8a8 100644 --- a/Runtime.msbuild +++ b/Runtime.msbuild @@ -21,7 +21,12 @@ <RemoveDir Directories="bin\$(Configuration)" /> </Target> - <Target Name="Prereq"> + <Target Name="Prereq" DependsOnTargets="PreRestorePackages"> + <MSBuild Projects="@(RestoreCsProjFiles)" Targets="RestorePackages" StopOnFirstFailure="true" /> + <MSBuild Projects=".nuget\nuget.targets" Targets="RestoreBinaryDependencies" /> + </Target> + + <Target Name="PreRestorePackages"> <ItemGroup> <RestoreCsProjFiles Include="test\Microsoft.Web.Http.Data.Test\*.csproj; @@ -29,15 +34,12 @@ src\System.Web.WebPages.Deployment\*.csproj; src\Microsoft.Web.WebPages.OAuth\*.csproj" /> </ItemGroup> - <Message Text="Restoring NuGet packages..." Importance="High" /> - <MSBuild Projects="@(RestoreCsProjFiles)" Targets="RestorePackages" StopOnFirstFailure="true" /> - <MSBuild Projects=".nuget\nuget.targets" Targets="RestoreBinaryDependencies" /> </Target> - <Target Name="RestorePackages"> - <SetEnvironmentVariable EnvKey="EnableNuGetPackageRestore" EnvValue="true" /> - <CallTarget Targets="Prereq" /> + <Target Name="RestorePackages" DependsOnTargets="PreRestorePackages"> + <MSBuild Projects="@(RestoreCsProjFiles)" Targets="EnableRestore;RestorePackages" StopOnFirstFailure="true" /> + <MSBuild Projects=".nuget\nuget.targets" Targets="EnableRestore;RestoreBinaryDependencies" /> </Target> <Target Name="Build" DependsOnTargets="Prereq"> @@ -59,20 +61,4 @@ <MakeDir Directories="$(TestResultsDirectory)" /> <MSBuild Projects="@(XunitProject)" BuildInParallel="$(BuildInParallel)" Targets="Xunit" /> </Target> - - <UsingTask TaskName="SetEnvironmentVariable" TaskFactory="CodeTaskFactory" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll"> - <ParameterGroup> - <EnvKey ParameterType="System.String" Required="true" /> - <EnvValue ParameterType="System.String" Required="true" /> - </ParameterGroup> - <Task> - <Using Namespace="System" /> - <Code Type="Fragment" Language="cs"> - <![CDATA[ - try { Environment.SetEnvironmentVariable(EnvKey, EnvValue, System.EnvironmentVariableTarget.Process); } - catch { } - ]]> - </Code> - </Task> - </UsingTask> </Project> |