diff --git a/Directory.Build.props b/Directory.Build.props
index 328948d61966..4b4ac00646fc 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -61,12 +61,9 @@
$(ProjectDir)src\
+ $(ProjectDir)artifacts/tools/
$(BinDir)tests/
- $(ProjectDir)artifacts/helix/
- $(TestArchiveRoot)tests/
- $(TestArchiveRoot)runtime/
-
$(DotNetRestorePackagesPath)
$([MSBuild]::EnsureTrailingSlash('$(NuGetPackageRoot)'))
@@ -80,6 +77,8 @@
$(DotNetRoot)\
$(DotNetRoot)
"$(DotNetRoot)dotnet"
+ $(DotNetRoot)dotnet
+ $(DotNetCmd).exe
@@ -373,6 +372,9 @@
$(RefRootPath)$(TargetGroup.TrimEnd('t').TrimEnd('o').TrimEnd('a'))/
$(RefRootPath)netstandard/
$(RefRootPath)netfx/
+ $(ProjectDir)artifacts/helix/
+ $(TestArchiveRoot)tests/
+ $(TestArchiveRoot)runtime/$(BuildConfiguration)/
$(ProjectDir)\external\runtime\runtime.depproj
diff --git a/eng/Tools.props b/eng/Tools.props
index e20a3716e1d4..1cd35cd089e4 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -11,6 +11,11 @@
$(ArtifactsToolsetDir)Common\Tools.Analyzers.props
+
+ $(RepoRoot).dotnet\
+ $(DotNetRoot)dotnet
+ $(DotNetCmd).exe
+ $(ArtifactsDir)tools/
@@ -46,10 +51,6 @@
$(PackagesDir)$(BuildToolsPackage)/$(BuildToolsPackageVersion)/lib/
cmd
sh
- $(RepoRoot).dotnet\
- $(DotNetRoot)dotnet
- $(DotNetCmd).exe
-
$(BuildToolsPackageDir)init-tools.$(CmdExt) $(RepoRoot) $(DotNETCmd) $(ToolsDir) $(PackagesDir)
@@ -61,6 +62,36 @@
+
+
+
+
+
+
+
+
+ $([System.Text.RegularExpressions.Regex]::Escape('%(RepoTool.Identity)'))
+ $([System.Text.RegularExpressions.Regex]::Escape('%(RepoTool.Version)'))
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/eng/dependencies.props b/eng/dependencies.props
index 5be3252c5117..7946cc4d271f 100644
--- a/eng/dependencies.props
+++ b/eng/dependencies.props
@@ -53,6 +53,10 @@
2.0.5
1.0.23
+
+ 1.3.0
+ 4.0.4
+
4.6.0-alpha-00001
$(ProjectNTfsTestILCPackageVersion)
diff --git a/external/test-runtime/XUnit.Runtime.depproj b/external/test-runtime/XUnit.Runtime.depproj
index 2968cdb67309..1bdcd8d3a8da 100644
--- a/external/test-runtime/XUnit.Runtime.depproj
+++ b/external/test-runtime/XUnit.Runtime.depproj
@@ -21,6 +21,7 @@
xunit.runner.visualstudio.testadapter
Microsoft.NET.Test.Sdk
microsoft.testplatform.testhost
+ Microsoft.Diagnostics.Tracing.TraceEvent
testhost
c#
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 6c50a8960fe6..e82d0d460ead 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -19,15 +19,6 @@
$(AssemblySearchPaths);$(RefPath);{RawFileName}
-
-
- <_ProjectDirectoryUnderSourceDir>$(MSBuildProjectDirectory.SubString($(SourceDir.Length)))
- $(_ProjectDirectoryUnderSourceDir.SubString(0, $(_ProjectDirectoryUnderSourceDir.IndexOfAny("\\/"))))
-
-