diff --git a/Microsoft.DotNet.Cli.sln b/Microsoft.DotNet.Cli.sln
index 0934f2d48..0949bd419 100644
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@@ -15,6 +15,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Test
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "core-sdk-tasks", "src\core-sdk-tasks\core-sdk-tasks.csproj", "{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}"
EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.TestFramework", "test\Microsoft.DotNet.TestFramework\Microsoft.DotNet.TestFramework.csproj", "{D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -127,6 +129,30 @@ Global
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.Debug|x64.ActiveCfg = Debug|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.Debug|x64.Build.0 = Debug|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.Debug|x86.ActiveCfg = Debug|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.Debug|x86.Build.0 = Debug|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.MinSizeRel|x64.Build.0 = Debug|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.MinSizeRel|x86.Build.0 = Debug|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.Release|Any CPU.Build.0 = Release|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.Release|x64.ActiveCfg = Release|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.Release|x64.Build.0 = Release|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.Release|x86.ActiveCfg = Release|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.Release|x86.Build.0 = Release|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -136,6 +162,7 @@ Global
{1BFF54F9-4E35-49DB-893C-AF2047722FC6} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{48E260F4-6F3F-4387-B61F-D15BABD06D9A} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
{53AF2D01-B69F-4CD0-86A7-8FD95967D23C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
+ {D03CF1D2-39D1-4825-9AF0-4A4D3882CB69} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {B526D2CE-EE2D-4AD4-93EF-1867D90FF1F5}
diff --git a/old/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentPlatform.cs b/src/core-sdk-tasks/CurrentPlatform.cs
similarity index 98%
rename from old/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentPlatform.cs
rename to src/core-sdk-tasks/CurrentPlatform.cs
index 91bd81d17..8875e495c 100644
--- a/old/build_projects/Microsoft.DotNet.Cli.Build.Framework/CurrentPlatform.cs
+++ b/src/core-sdk-tasks/CurrentPlatform.cs
@@ -5,6 +5,7 @@ using System;
using System.Linq;
using System.Runtime.InteropServices;
using Microsoft.DotNet.PlatformAbstractions;
+using RuntimeEnvironment = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment;
namespace Microsoft.DotNet.Cli.Build.Framework
{
diff --git a/old/build_projects/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildPlatform.cs b/src/core-sdk-tasks/Enumerations/BuildPlatform.cs
similarity index 100%
rename from old/build_projects/Microsoft.DotNet.Cli.Build.Framework/Enumerations/BuildPlatform.cs
rename to src/core-sdk-tasks/Enumerations/BuildPlatform.cs
diff --git a/old/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs b/src/core-sdk-tasks/GetCurrentRuntimeInformation.cs
similarity index 100%
rename from old/build_projects/dotnet-cli-build/GetCurrentRuntimeInformation.cs
rename to src/core-sdk-tasks/GetCurrentRuntimeInformation.cs
diff --git a/src/core-sdk-tasks/core-sdk-tasks.csproj b/src/core-sdk-tasks/core-sdk-tasks.csproj
index 9f90d365a..42cb84d27 100644
--- a/src/core-sdk-tasks/core-sdk-tasks.csproj
+++ b/src/core-sdk-tasks/core-sdk-tasks.csproj
@@ -6,5 +6,6 @@
+
diff --git a/src/redist/redist.csproj b/src/redist/redist.csproj
index 2520c2bf7..980d8a938 100644
--- a/src/redist/redist.csproj
+++ b/src/redist/redist.csproj
@@ -1,4 +1,4 @@
-
+
$(CoreSdkTargetFramework)
true
@@ -6,6 +6,9 @@
+
+
+
diff --git a/src/redist/targets/BuildCoreSdkTasks.targets b/src/redist/targets/BuildCoreSdkTasks.targets
index ad40a1693..841e45efd 100644
--- a/src/redist/targets/BuildCoreSdkTasks.targets
+++ b/src/redist/targets/BuildCoreSdkTasks.targets
@@ -14,4 +14,7 @@
+
+
+
diff --git a/src/redist/targets/BundledComponents.targets b/src/redist/targets/BundledComponents.targets
new file mode 100644
index 000000000..71caad51d
--- /dev/null
+++ b/src/redist/targets/BundledComponents.targets
@@ -0,0 +1,96 @@
+
+
+
+ https://dotnetcli.azureedge.net/dotnet/
+
+ $(HostRid)
+ $(HostMonikerRid)
+
+
+ -internal
+
+
+ dotnet-runtime-deps-$(SharedHostVersion)-$(CoreSetupRid)$(InstallerExtension)
+
+
+
+ $(CoreSetupRid)
+ x64
+
+ dotnet-host$(InstallerStartSuffix)-$(SharedHostVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)
+
+
+ dotnet-hostfxr$(InstallerStartSuffix)-$(HostFxrVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)
+
+
+ dotnet-runtime$(InstallerStartSuffix)-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)
+
+
+ dotnet-extension-$(MicrosoftDesktopUIPackageVersion)-$(SharedFrameworkInstallerFileRid)$(InstallerExtension)
+
+
+
+ $(CoreSetupRid)
+ $(ProductMonikerRid)
+ linux-$(Architecture)
+ dotnet-runtime-$(MicrosoftNETCoreAppPackageVersion)-$(SharedFrameworkRid)$(ArchiveExtension)
+
+ $(SharedFrameworkRid)
+ linux-x64
+ $(AspNetCoreSharedFxInstallerRid)
+ x64
+
+ aspnetcore-runtime-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid)$(InstallerExtension)
+
+ aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxInstallerRid).wixlib
+
+
+ aspnetcore-runtime-internal-$(AspNetCoreVersion)-$(AspNetCoreSharedFxArchiveRid)$(ArchiveExtension)
+
+
+ dotnet-extension-$(MicrosoftDesktopUIPackageVersion)-$(Architecture)$(ArchiveExtension)
+
+
+
+ aspnetcore_base_runtime.version
+ $(PackagesDirectory)/$(AspNetCoreSharedFxBaseRuntimeVersionFileName)
+
+
+
+ $(CoreSetupBlobRootUrl)Runtime/
+ $(CoreSetupBlobRootUrl)aspnetcore/Runtime/
+ $(DotnetExtensionsBlobRootUrl)dotnet-extensions/
+ $(IntermediateDirectory)/coreSetupDownload/$(MicrosoftNETCoreAppPackageVersion)
+ $(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive$(ArchiveExtension)
+
+
+
+
+
+
+ $(CoreSetupRootUrl)$(MicrosoftNETCoreAppPackageVersion)
+ $(CombinedFrameworkHostCompressedFileName)
+ $(CoreSetupBlobAccessTokenParam)
+
+
+
+
+
+
+
+
+
+ $(IntermediateOutputPath)downloads\%(DownloadFileName)
+
+
+ true
+
+
+
+
+
+
+
diff --git a/src/redist/targets/FileExtensions.targets b/src/redist/targets/FileExtensions.targets
new file mode 100644
index 000000000..39156c348
--- /dev/null
+++ b/src/redist/targets/FileExtensions.targets
@@ -0,0 +1,32 @@
+
+
+
+ .zip
+ .tar.gz
+
+ .msi
+ .pkg
+ .deb
+ .rpm
+
+ .exe
+ $(InstallerExtension)
+ $(InstallerExtension)
+ $(InstallerExtension)
+
+ lib
+
+
+ .so
+ .dll
+ .dylib
+
+ .exe
+
+
+ .ps1
+ .sh
+
+
+
+
diff --git a/src/redist/targets/GetRuntimeInformation.targets b/src/redist/targets/GetRuntimeInformation.targets
new file mode 100644
index 000000000..ae6fc0ad6
--- /dev/null
+++ b/src/redist/targets/GetRuntimeInformation.targets
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+ True
+ $(HostOSName)
+ $(HostOSPlatform)
+ linux
+ linux
+
+ x64
+ $(OSName)-$(Architecture)
+
+
+
+ true
+ true
+ true
+ true
+
+
+
+ $(Rid)
+ $(OSName)-$(Architecture)
+
+ $(HostRid)
+ $(HostOSName)-$(Architecture)
+ $(HostMonikerRid)
+ $(Architecture)
+
+ dotnet-sdk-internal
+ dotnet-sdk
+
+ $(ArtifactNameSdk)-$(SdkVersion)-$(ProductMonikerRid)
+ dotnet-standard-support-vs2015-$(SdkVersion)-$(ProductMonikerRid)
+ $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-$(ProductMonikerRid)
+ $(ArtifactNameCombinedHostHostFxrFrameworkSdk)-$(SdkVersion)-
+ $(DistroSpecificArtifactNameWithVersionCombinedHostHostFxrFrameworkSdkWithoutHostMonikerRid)$(HostMonikerRidForFileName)
+
+
+