diff options
author | Jeremy Kuhne <jeremy.kuhne@microsoft.com> | 2015-04-08 21:22:04 +0300 |
---|---|---|
committer | Jeremy Kuhne <jeremy.kuhne@microsoft.com> | 2015-04-09 02:40:28 +0300 |
commit | 7faeff6febd1e11b66c757add6eb81934e594ed6 (patch) | |
tree | b21f002e98bf1f8c397474c6165d4f344a315853 /dir.targets | |
parent | 3e2499328810fc88726e64d0c6470d061c1040ef (diff) |
Make path property changes to allow for building with MSBuild on Unix. This handles the first step of
package restoration and basic compilation.
Conflicts:
dir.props
src/.nuget/packages.config
Diffstat (limited to 'dir.targets')
-rw-r--r-- | dir.targets | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/dir.targets b/dir.targets index bdf1ea4dfe..976cfd29c9 100644 --- a/dir.targets +++ b/dir.targets @@ -50,9 +50,13 @@ Address="https://www.nuget.org/nuget.exe" Condition="!Exists('$(NuGetToolPath)')" /> + <PropertyGroup> + <_RestoreBuildToolsCommand>$(NugetRestoreCommand) "$(SourceDir).nuget/packages.config"</_RestoreBuildToolsCommand> + </PropertyGroup> + <!-- Restore build tools --> - <Exec Command="$(NugetRestoreCommand) "$(SourceDir).nuget\packages.config"" StandardOutputImportance="Low" /> - + <Exec Command="$(_RestoreBuildToolsCommand)" StandardOutputImportance="Low" /> + <Error Condition="'$(ErrorIfBuildToolsRestoredFromIndividualProject)'=='true'" Text="The build tools package was just restored and so we cannot continue the build of an individual project because targets from the build tools package were not able to be imported. Please retry the build the individual project again." /> @@ -70,4 +74,4 @@ <Target Name="Test" /> -</Project>
\ No newline at end of file +</Project> |