diff options
| author | Senthil <schellap@microsoft.com> | 2016-02-05 06:41:02 +0300 |
|---|---|---|
| committer | Senthil <schellap@microsoft.com> | 2016-02-06 03:28:54 +0300 |
| commit | a1f2ba2cae2dac1d134ae9afd60462cf57dde3c3 (patch) | |
| tree | 3a479c47244353aad6121aa4ebdff5b584f009c8 /dir.props | |
| parent | f46fd89272ff210a0c5dc4bcb4017ba59f84171e (diff) | |
Revert "Merge pull request #717 from schellap/break2"
This reverts commit 766f4ea7ff4d9dcd0422da1ebd115eb6b279e684, reversing
changes made to ce31cfa86e2d82af79212a1b09b7c1fe05baf3f6.
Revert "Merge pull request #767 from schellap/wmain"
This reverts commit 86e568eb6e82e2526ace252fcb49903e298e708d, reversing
changes made to 1d3ef5fd841effc0599511e3073a0cad53bed88b.
Revert formatting to old project.json and cppcompilerflag in runtest.cmd
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 18 |
1 files changed, 2 insertions, 16 deletions
@@ -1,4 +1,4 @@ -<Project ToolsVersion="12.0" DefaultTargets="Build" InitialTargets="CheckRoslyn;OverrideBuildTools" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project ToolsVersion="12.0" DefaultTargets="Build" InitialTargets="CheckRoslyn" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Condition="Exists('..\dir.props') And '$(RepoLocalBuild)'!='true'" Project="..\dir.props" /> <!-- @@ -150,6 +150,7 @@ <!-- list of directories to perform batch restore --> <ItemGroup> <DnuRestoreDir Include=""$(MSBuildProjectDirectory)\src"" /> + <DnuRestoreDir Include=""$(ToolsDir)"" /> </ItemGroup> <PropertyGroup> @@ -294,19 +295,4 @@ <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> |