diff options
| author | Senthil <schellap@microsoft.com> | 2016-01-21 07:45:27 +0300 |
|---|---|---|
| committer | Senthil <schellap@microsoft.com> | 2016-01-29 13:05:09 +0300 |
| commit | e8cc957fcf728e168d73e99dabe97d32a2965125 (patch) | |
| tree | 6ac8b5c868987f26dab65158a37bd8816244e8ed /dir.props | |
| parent | f60bc0fe53f88907ec554b558f974e54cf5dd241 (diff) | |
Fix project.json syntax for dotnet restore
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" /> <!-- @@ -151,7 +151,6 @@ <!-- list of directories to perform batch restore --> <ItemGroup> <DnuRestoreDir Include=""$(MSBuildProjectDirectory)\src"" /> - <DnuRestoreDir Include=""$(ToolsDir)"" /> </ItemGroup> <PropertyGroup> @@ -296,4 +295,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> |