diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2016-02-08 04:32:26 +0300 |
|---|---|---|
| committer | Jan Kotas <jkotas@microsoft.com> | 2016-02-10 07:29:11 +0300 |
| commit | ffc8df5bc764c3ce34e938abd34943bcf61687fd (patch) | |
| tree | aac552bcc175c3926b6f0237c9714fa3d6bc291a /dir.props | |
| parent | 2c057e7ab0ad2ab1ff476094674a303a082960b9 (diff) | |
Switch to live CLI build
This reverts commit 374d1f1f2d901b4ef1096fbac2bb3da85e73949e.
This reverts commit 81fe8e5d944fdbe2560815f4aead1ab4a447fb5a.
This reverts commit 3d2d89e793d1588e1aa7d2273fc880ae208352f5.
This reverts commit a1f2ba2cae2dac1d134ae9afd60462cf57dde3c3.
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 18 |
1 files changed, 16 insertions, 2 deletions
@@ -1,4 +1,4 @@ -<Project ToolsVersion="12.0" DefaultTargets="Build" InitialTargets="CheckRoslyn" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="12.0" DefaultTargets="Build" InitialTargets="CheckRoslyn;OverrideBuildTools" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Condition="Exists('..\dir.props') And '$(RepoLocalBuild)'!='true'" Project="..\dir.props" /> <!-- @@ -150,7 +150,6 @@ <!-- list of directories to perform batch restore --> <ItemGroup> <DnuRestoreDir Include=""$(MSBuildProjectDirectory)\src"" /> - <DnuRestoreDir Include=""$(ToolsDir)"" /> </ItemGroup> <PropertyGroup> @@ -295,4 +294,19 @@ <Warning Condition="!Exists('$(RoslynPropsFile)')" Text="The Roslyn targets do not exist- Roslyn will not be used for this build, but the package should be restored if you build again." /> </Target> + + + <Target Name="OverrideBuildTools"> + <Error Condition="'$(BuildToolsVersion)'!='1.0.25-prerelease-00111'" Text="Confirm below project.json overrides are still compatibile with this version."></Error> + <PropertyGroup> + <!-- + These overrides are for $(PackagesDir)\Microsoft.DotNet.BuildTools.1.0.25-prerelease-00111\lib\tool-runtime\project.json and test-runtime\project.json + This is similar to how CoreFX handles these files. + --> + <TestRuntimeProjectJson>$(ProjectDir)src/packaging/buildtools/test-runtime/project.json</TestRuntimeProjectJson> + <TestRuntimeProjectLockJson>$(ProjectDir)src/packaging/buildtools/test-runtime/project.lock.json</TestRuntimeProjectLockJson> + <ToolRuntimeProjectJson>$(ProjectDir)src/packaging/buildtools/tool-runtime/project.json</ToolRuntimeProjectJson> + <ToolRuntimeProjectLockJson>$(ProjectDir)src/packaging/buildtools/tool-runtime/project.lock.json</ToolRuntimeProjectLockJson> + </PropertyGroup> + </Target> </Project> |