diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index ada643237..9f45a0657 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -28,7 +28,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
build\Branding.props = build\Branding.props
build\BranchInfo.props = build\BranchInfo.props
build\BuildDefaults.props = build\BuildDefaults.props
- build\BuildOutputs.props = build\BuildOutputs.props
build\BundledRuntimes.props = build\BundledRuntimes.props
build\BundledSdks.proj = build\BundledSdks.proj
build\BundledSdks.props = build\BundledSdks.props
@@ -36,8 +35,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
build\BundledTemplates.props = build\BundledTemplates.props
build\BundledTools.props = build\BundledTools.props
build\Compile.targets = build\Compile.targets
- build\CoreSetupInfo.props = build\CoreSetupInfo.props
- build\CrossgenInfo.props = build\CrossgenInfo.props
build\DependencyVersions.props = build\DependencyVersions.props
build\FileExtensions.props = build\FileExtensions.props
build\GitCommitInfo.targets = build\GitCommitInfo.targets
diff --git a/build/BuildOutputs.props b/build/BuildOutputs.props
deleted file mode 100644
index 6410dcd89..000000000
--- a/build/BuildOutputs.props
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
- dotnet$(ExeExtension)
- $(DynamicLibPrefix)hostfxr$(DynamicLibExtension)
- $(DynamicLibPrefix)hostpolicy$(DynamicLibExtension)
- $(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma
-
-
diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index df527f812..a1758c4f1 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -33,7 +33,9 @@
dotnet-$(ProductMonikerRid).$(AdditionalSharedFrameworkVersion)$(ArchiveExtension)
+
+ master
https://dotnetcli.azureedge.net/dotnet/
$(CoreSetupBlobRootUrl)$(CoreSetupChannel)
$(CoreSetupBlobRootUrlWithChannel)/Binaries/$(SharedFrameworkVersion)
diff --git a/build/Compile.targets b/build/Compile.targets
index fe30dbb72..221c49624 100644
--- a/build/Compile.targets
+++ b/build/Compile.targets
@@ -2,6 +2,15 @@
+
+ runtime.$(CoreCLRRid).microsoft.netcore.app
+ $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/tools/crossgen$(ExeExtension)
+ $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/runtimes/$(CoreCLRRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)
+ $(RepoRoot)/resources/MSBuildImports
+ $(SdkOutputDirectory)/runtimes/any/native
+ $(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)
+
+
diff --git a/build/CoreSetupInfo.props b/build/CoreSetupInfo.props
deleted file mode 100644
index 16d4628c2..000000000
--- a/build/CoreSetupInfo.props
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
- master
-
-
diff --git a/build/CrossgenInfo.props b/build/CrossgenInfo.props
deleted file mode 100644
index 6e980d55e..000000000
--- a/build/CrossgenInfo.props
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
- runtime.$(CoreCLRRid).microsoft.netcore.app
- $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/tools/crossgen$(ExeExtension)
- $(NuGetPackagesDir)/$(RuntimeNETCoreAppPackageName)/$(CLI_SharedFrameworkVersion)/runtimes/$(CoreCLRRid)/native/$(DynamicLibPrefix)clrjit$(DynamicLibExtension)
-
-
diff --git a/build/InputDirectories.props b/build/InputDirectories.props
index d322b67bc..0fc1b7a74 100644
--- a/build/InputDirectories.props
+++ b/build/InputDirectories.props
@@ -1,8 +1,6 @@
- runtimes/any/native
$(RepoRoot)/build_projects/dotnet-cli-build
- $(RepoRoot)/resources/MSBuildImports
$(RepoRoot)/src
$(RepoRoot)/test/
diff --git a/build/OutputDirectories.props b/build/OutputDirectories.props
index ecba47bc3..07f70c2af 100644
--- a/build/OutputDirectories.props
+++ b/build/OutputDirectories.props
@@ -1,10 +1,6 @@
$(RepoRoot)/artifacts/$(Rid)
- $(BaseOutputDirectory)/tools
- $(BaseOutputDirectory)/stage1
- $(BaseOutputDirectory)/stage1symbols
- $(Stage1Directory)/dotnet$(ExeExtension)
$(BaseOutputDirectory)/stage2
$(BaseOutputDirectory)/stage2symbols
$(Stage2Directory)/sdk/$(SdkVersion)
@@ -15,18 +11,9 @@
$(Stage2Directory)
$(Stage2SymbolsDirectory)
$(Stage2SdkDirectory)
- $(SdkOutputDirectory)/runtimes/any/native
$(BaseOutputDirectory)/intermediate
$(BaseOutputDirectory)/packages
$(IntermediateDirectory)/sharedFrameworkPublish
- $(StageDirectory)/shared/$(SharedFrameworkName)/$(SharedFrameworkVersion)
- $(Stage2Directory)
$(RepoRoot)/artifacts/testpackages/
- $(TestOutputDir)/packagesBuild/
- $(TestOutputDir)/packages/
- $(TestOutputDir)/artifacts/
- $(TestOutputDir)/results/
- $(IntermediateDirectory)/NuGetPackagesArchiveProject
- $(IntermediateDirectory)/NuGetPackagesArchiveFolder
diff --git a/build/Prepare.targets b/build/Prepare.targets
index 2d335945d..b29d8737d 100644
--- a/build/Prepare.targets
+++ b/build/Prepare.targets
@@ -48,7 +48,7 @@
-
@@ -73,7 +73,7 @@
-
diff --git a/build/Stage0.props b/build/Stage0.props
index 12b82cefb..12905e100 100644
--- a/build/Stage0.props
+++ b/build/Stage0.props
@@ -5,7 +5,6 @@
$(Stage0Directory)/dotnet$(ExeExtension)
False
True
- $(Stage0Directory)
$(Rid)
win7-$(Architecture)
osx.10.10-x64
diff --git a/build/Test.targets b/build/Test.targets
index 9a49e1edf..5f49cd97a 100644
--- a/build/Test.targets
+++ b/build/Test.targets
@@ -7,6 +7,9 @@
%3b
$(Stage2Directory)$(PathListSeparator)$(PATH)
$(Stage2Directory)
+ $(TestOutputDir)/packages/
+ $(TestOutputDir)/artifacts/
+ $(TestOutputDir)/results/
diff --git a/build/compile/LzmaArchive.targets b/build/compile/LzmaArchive.targets
index a70316354..ad985a06c 100644
--- a/build/compile/LzmaArchive.targets
+++ b/build/compile/LzmaArchive.targets
@@ -3,7 +3,6 @@
false
- $(ToolsOutputDirectory)/Archiver.dll
<configuration>
<packageSources>
@@ -11,7 +10,13 @@
</packageSources>
</configuration>
+
+ $(IntermediateDirectory)/NuGetPackagesArchiveProject
+ $(IntermediateDirectory)/NuGetPackagesArchiveFolder
$(NuGetPackagesArchiveProject)/Nuget.config
+ $(BaseOutputDirectory)/tools
+ $(ToolsOutputDirectory)/Archiver.dll
+ $(Stage2Directory)/sdk/$(SdkVersion)/nuGetPackagesArchive.lzma
+
+ $(TestOutputDir)/packagesBuild/
+
+
diff --git a/dir.props b/dir.props
index 2e19168c2..44c03f7e7 100644
--- a/dir.props
+++ b/dir.props
@@ -16,9 +16,8 @@
-
+
-
@@ -30,12 +29,10 @@
-
-