Merge pull request #4595 from livarcocc/merge_release/3.0.1xx_into_release/3.0.100-preview9

Merge release/3.0.1xx into release/3.0.100 preview9
2019-09-05 14:08:32 -07:00 · 2019-09-05 14:08:32 -07:00 · 7ef178c88f
commit 7ef178c88f
parent 8e7ef240a5 f0d988effa
15 changed files with 646 additions and 131 deletions
--- a/.gitignore
+++ b/.gitignore
@ -95,8 +95,10 @@ dlldata.c

 # Build artifacts
 artifacts/
+artifacts-*/
 bin/
 .dotnet/
+.dotnet-*/

 *_i.c
 *_p.c
--- a/Microsoft.DotNet.Cli.sln
+++ b/Microsoft.DotNet.Cli.sln
@ -19,6 +19,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkResolver", "src\SdkResol
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Dotnet.Sdk.Internal", "src\Microsoft.Dotnet.Sdk.Internal\Microsoft.Dotnet.Sdk.Internal.csproj", "{73F07908-981B-41BB-B9BD-F3420274A6F7}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SdkTests", "test\SdkTests\SdkTests.csproj", "{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -49,6 +51,10 @@ Global
 		{73F07908-981B-41BB-B9BD-F3420274A6F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{73F07908-981B-41BB-B9BD-F3420274A6F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{73F07908-981B-41BB-B9BD-F3420274A6F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CB1EE94E-CB83-4071-9DD0-9929AE2B7282}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@ -59,6 +65,7 @@ Global
 		{53AF2D01-B69F-4CD0-86A7-8FD95967D23C} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
 		{78E15EC1-7732-41E3-8591-934E9F583254} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 		{7EE15292-2CAD-44FA-8A1F-BAC4688A49E0} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
+		{CB1EE94E-CB83-4071-9DD0-9929AE2B7282} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {B526D2CE-EE2D-4AD4-93EF-1867D90FF1F5}
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@ -2,66 +2,66 @@
 <Dependencies>
  <ProductDependencies>
    <!-- Winforms / WPF -->
-    <Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-preview9-19423-09">
+    <Dependency Name="Microsoft.WindowsDesktop.App" Version="3.0.0-rc1-19455-02">
      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>2be172345a420387413bab7ce9053a52624c4461</Sha>
+      <Sha>caa8d3b1edd7eec947f6283f8342a9249b5d7171</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-preview9-19423-09">
+    <Dependency Name="Microsoft.NETCore.App" Version="3.0.0-rc1-19455-02">
      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>2be172345a420387413bab7ce9053a52624c4461</Sha>
+      <Sha>caa8d3b1edd7eec947f6283f8342a9249b5d7171</Sha>
    </Dependency>
-    <Dependency Name="NETStandard.Library.Ref" Version="2.1.0-preview9-19423-09">
+    <Dependency Name="NETStandard.Library.Ref" Version="2.1.0-rc1-19455-02">
      <Uri>https://github.com/dotnet/core-setup</Uri>
-      <Sha>2be172345a420387413bab7ce9053a52624c4461</Sha>
+      <Sha>caa8d3b1edd7eec947f6283f8342a9249b5d7171</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-preview9.19424.4">
+    <Dependency Name="Microsoft.AspNetCore.App.Ref" Version="3.0.0-rc1.19453.1">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>66de493473521e173fa15ca557f5f97601cedb23</Sha>
+      <Sha>0abe61f391b30219ce5983b9a2964c1d85665449</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-preview9.19424.4">
+    <Dependency Name="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.0.0-rc1.19453.1">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>66de493473521e173fa15ca557f5f97601cedb23</Sha>
+      <Sha>0abe61f391b30219ce5983b9a2964c1d85665449</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-preview9.19424.4">
+    <Dependency Name="Microsoft.AspNetCore.DeveloperCertificates.XPlat" Version="3.0.0-rc1.19453.1">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>66de493473521e173fa15ca557f5f97601cedb23</Sha>
+      <Sha>0abe61f391b30219ce5983b9a2964c1d85665449</Sha>
    </Dependency>
-    <Dependency Name="dotnet-dev-certs" Version="3.0.0-preview9.19424.4">
+    <Dependency Name="dotnet-dev-certs" Version="3.0.0-rc1.19453.1">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>66de493473521e173fa15ca557f5f97601cedb23</Sha>
+      <Sha>0abe61f391b30219ce5983b9a2964c1d85665449</Sha>
    </Dependency>
-    <Dependency Name="dotnet-user-secrets" Version="3.0.0-preview9.19424.4">
+    <Dependency Name="dotnet-user-secrets" Version="3.0.0-rc1.19453.1">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>66de493473521e173fa15ca557f5f97601cedb23</Sha>
+      <Sha>0abe61f391b30219ce5983b9a2964c1d85665449</Sha>
    </Dependency>
-    <Dependency Name="dotnet-watch" Version="3.0.0-preview9.19424.4">
+    <Dependency Name="dotnet-watch" Version="3.0.0-rc1.19453.1">
      <Uri>https://github.com/aspnet/AspNetCore</Uri>
-      <Sha>66de493473521e173fa15ca557f5f97601cedb23</Sha>
+      <Sha>0abe61f391b30219ce5983b9a2964c1d85665449</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.0-preview8.19381.4">
+    <Dependency Name="Microsoft.DotNet.Common.ItemTemplates" Version="3.0.0-preview8.19381.4" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
      <Uri>https://github.com/dotnet/templating</Uri>
      <Sha>e8d6da33000a416b2b36b4f04b1756dcc99f671d</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-preview9.19426.19">
+    <Dependency Name="Microsoft.Dotnet.Toolset.Internal" Version="3.0.100-rc1.19455.2">
      <Uri>https://github.com/dotnet/toolset</Uri>
-      <Sha>09b1fb2a89520ab36ad81eeaeedc3c1104df12fa</Sha>
+      <Sha>0006e3e685090a98024a0060c05164e71fbbd148</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-preview9.19426.11" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.NET.Sdk" Version="3.0.100-rc1.19453.1" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
      <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>1c91e0a4d59ba7d254637f3e3a430ad3aab6992f</Sha>
+      <Sha>59e63b28d24a769652b754f341d38c9de7c3d0d1</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-preview9.19426.10" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
+    <Dependency Name="Microsoft.DotNet.MSBuildSdkResolver" Version="3.0.100-rc1.19454.5" CoherentParentDependency="Microsoft.Dotnet.Toolset.Internal">
      <Uri>https://github.com/dotnet/cli</Uri>
-      <Sha>2859af6e958aa74edfa69ceffa33f1338996e011</Sha>
+      <Sha>a408b580b491bb17f444034bdda51e0986873bd1</Sha>
    </Dependency>
    <!-- For coherency purposes, these versions should be gated by the versions of winforms and wpf routed via core setup -->
-    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-preview9.19420.3" CoherentParentDependency="Microsoft.WindowsDesktop.App">
+    <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="4.8.0-preview9.19417.1" CoherentParentDependency="Microsoft.WindowsDesktop.App">
      <Uri>https://github.com/dotnet/winforms</Uri>
-      <Sha>7f2c6adc229513b8a3690d0c59079073a783d33f</Sha>
+      <Sha>dd6650900f5af7283c6af6ec85de4d8d51f28961</Sha>
    </Dependency>
-    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview9.19421.3" CoherentParentDependency="Microsoft.WindowsDesktop.App">
+    <Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="3.0.0-preview9.19417.4" CoherentParentDependency="Microsoft.WindowsDesktop.App">
      <Uri>https://github.com/dotnet/wpf</Uri>
-      <Sha>4524e3a8b4d8ebc8643b6e2185a597700261e1fb</Sha>
+      <Sha>ffc3fbd836fb6ff3c28e50fec67be5b55c8b6542</Sha>
    </Dependency>
  </ProductDependencies>
  <ToolsetDependencies>
--- a/eng/Versions.props
+++ b/eng/Versions.props
@ -12,39 +12,39 @@
    <PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
  </PropertyGroup>
  <PropertyGroup>
-    <MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-preview9.19426.19</MicrosoftDotnetToolsetInternalPackageVersion>
+    <MicrosoftDotnetToolsetInternalPackageVersion>3.0.100-rc1.19455.2</MicrosoftDotnetToolsetInternalPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/winforms -->
-    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.0-preview9.19420.3</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
+    <MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>4.8.0-preview9.19417.1</MicrosoftDotnetWinFormsProjectTemplatesPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependency from https://github.com/dotnet/wpf -->
-    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview9.19421.3</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
+    <MicrosoftDotNetWpfProjectTemplatesPackageVersion>3.0.0-preview9.19417.4</MicrosoftDotNetWpfProjectTemplatesPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/aspnet/AspNetCore -->
-    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-preview9.19424.4</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
-    <MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-preview9.19424.4</MicrosoftAspNetCoreAppRefPackageVersion>
-    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-preview9.19424.4</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
-    <dotnetdevcertsPackageVersion>3.0.0-preview9.19424.4</dotnetdevcertsPackageVersion>
-    <dotnetusersecretsPackageVersion>3.0.0-preview9.19424.4</dotnetusersecretsPackageVersion>
-    <dotnetwatchPackageVersion>3.0.0-preview9.19424.4</dotnetwatchPackageVersion>
+    <MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>3.0.0-rc1.19453.1</MicrosoftAspNetCoreAppRuntimewinx64PackageVersion>
+    <MicrosoftAspNetCoreAppRefPackageVersion>3.0.0-rc1.19453.1</MicrosoftAspNetCoreAppRefPackageVersion>
+    <MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>3.0.0-rc1.19453.1</MicrosoftAspNetCoreDeveloperCertificatesXPlatPackageVersion>
+    <dotnetdevcertsPackageVersion>3.0.0-rc1.19453.1</dotnetdevcertsPackageVersion>
+    <dotnetusersecretsPackageVersion>3.0.0-rc1.19453.1</dotnetusersecretsPackageVersion>
+    <dotnetwatchPackageVersion>3.0.0-rc1.19453.1</dotnetwatchPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/cli -->
-    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-preview9.19426.10</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
+    <MicrosoftDotNetMSBuildSdkResolverPackageVersion>3.0.100-rc1.19454.5</MicrosoftDotNetMSBuildSdkResolverPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <MicroBuildCorePackageVersion>0.2.0</MicroBuildCorePackageVersion>
  </PropertyGroup>
  <PropertyGroup>
    <!-- Dependencies from https://github.com/dotnet/sdk (to run tests) -->
-    <MicrosoftNETSdkPackageVersion>3.0.100-preview9.19426.11</MicrosoftNETSdkPackageVersion>
+    <MicrosoftNETSdkPackageVersion>3.0.100-rc1.19453.1</MicrosoftNETSdkPackageVersion>
    <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
-    <MicrosoftNETCoreAppPackageVersion>3.0.0-preview9-19423-09</MicrosoftNETCoreAppPackageVersion>
+    <MicrosoftNETCoreAppPackageVersion>3.0.0-rc1-19455-02</MicrosoftNETCoreAppPackageVersion>
    <MicrosoftNETCoreAppInternalPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreAppInternalPackageVersion>
    <MicrosoftNETCoreDotNetAppHostPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetAppHostPackageVersion>
    <MicrosoftNETCoreDotNetHostResolverPackageVersion>$(MicrosoftNETCoreAppPackageVersion)</MicrosoftNETCoreDotNetHostResolverPackageVersion>
@ -52,11 +52,11 @@
    <HostFxrVersion>$(MicrosoftNETCoreAppPackageVersion)</HostFxrVersion>
    <NetCoreAppTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppTargetingPackVersion>
    <NetCoreAppHostPackVersion>$(MicrosoftNETCoreAppPackageVersion)</NetCoreAppHostPackVersion>
-    <NETStandardLibraryRefPackageVersion>2.1.0-preview9-19423-09</NETStandardLibraryRefPackageVersion>
+    <NETStandardLibraryRefPackageVersion>2.1.0-rc1-19455-02</NETStandardLibraryRefPackageVersion>
    <WindowsDesktopTargetingPackVersion>$(MicrosoftNETCoreAppPackageVersion)</WindowsDesktopTargetingPackVersion>
    <AspNetCoreVersion>$(MicrosoftAspNetCoreAppRuntimeWinX64PackageVersion)</AspNetCoreVersion>
    <AspNetTargetingPackVersion>$(MicrosoftAspNetCoreAppRefPackageVersion)</AspNetTargetingPackVersion>
-    <MicrosoftWindowsDesktopAppPackageVersion>3.0.0-preview9-19423-09</MicrosoftWindowsDesktopAppPackageVersion>
+    <MicrosoftWindowsDesktopAppPackageVersion>3.0.0-rc1-19455-02</MicrosoftWindowsDesktopAppPackageVersion>
    <MicrosoftWindowsDesktopPackageVersion>$(MicrosoftWindowsDesktopAppPackageVersion)</MicrosoftWindowsDesktopPackageVersion>
  </PropertyGroup>
  <PropertyGroup>
--- a/eng/build.yml
+++ b/eng/build.yml
@ -26,6 +26,8 @@ phases:
    pool: ${{ parameters.pool }}
    ${{ if ne(parameters.strategy, '') }}:
      strategy: ${{ parameters.strategy }}
+    workspace:
+      clean: all

    variables: 
      - _AgentOSName: ${{ parameters.agentOs }}
@ -117,7 +119,7 @@ phases:
        testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'	
        platform: '$(BuildPlatform)'	
        configuration: '$(_BuildConfig)'	
-      condition: not(succeeded())
+      condition: ne(variables['TestParameter'], '')

    - task: CopyFiles@2	
      displayName: Gather Logs	
@ -128,7 +130,7 @@ phases:
         TestResults/$(_BuildConfig)/**/*	
        TargetFolder: '$(Build.ArtifactStagingDirectory)'	
      continueOnError: true	
-      condition: not(succeeded())	
+      condition: always()

    - task: PublishBuildArtifacts@1	
      displayName: Publish Logs to VSTS	
@ -137,4 +139,4 @@ phases:
        ArtifactName: '$(_AgentOSName)_$(Agent.JobName)_$(Build.BuildNumber)'	
        publishLocation: Container	
      continueOnError: true	
-      condition: not(succeeded())
+      condition: always()
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@ -132,7 +132,12 @@ function InitializeDotNetCli([bool]$install) {
  if ((-not $globalJsonHasRuntimes) -and ($env:DOTNET_INSTALL_DIR -ne $null) -and (Test-Path(Join-Path $env:DOTNET_INSTALL_DIR "sdk\$dotnetSdkVersion"))) {
    $dotnetRoot = $env:DOTNET_INSTALL_DIR
  } else {
+    
    $dotnetRoot = Join-Path $RepoRoot ".dotnet"
+    if ($env:ARCADE_PARTITION -ne $null)
+    {
+      $dotnetRoot = Join-Path $RepoRoot ".dotnet-$env:ARCADE_PARTITION"
+    }

    if (-not (Test-Path(Join-Path $dotnetRoot "sdk\$dotnetSdkVersion"))) {
      if ($install) {
@ -568,6 +573,10 @@ function GetMSBuildBinaryLogCommandLineArgument($arguments) {
 $RepoRoot = Resolve-Path (Join-Path $PSScriptRoot "..\..")
 $EngRoot = Resolve-Path (Join-Path $PSScriptRoot "..")
 $ArtifactsDir = Join-Path $RepoRoot "artifacts"
+if ($env:ARCADE_PARTITION -ne $null)
+{
+  $ArtifactsDir = Join-Path $RepoRoot "artifacts-$env:ARCADE_PARTITION"
+}
 $ToolsetDir = Join-Path $ArtifactsDir "toolset"
 $ToolsDir = Join-Path $RepoRoot ".tools"
 $LogDir = Join-Path (Join-Path $ArtifactsDir "log") $configuration
--- a/eng/common/tools.sh
+++ b/eng/common/tools.sh
@ -135,7 +135,9 @@ function InitializeDotNetCli {
    dotnet_root="$DOTNET_INSTALL_DIR"
  else
    dotnet_root="$repo_root/.dotnet"
-
+    if [[ -n "${ARCADE_PARTITION:-}" ]]; then
+      dotnet_root="$repo_root/.dotnet-$ARCADE_PARTITION"
+    fi
    export DOTNET_INSTALL_DIR="$dotnet_root"

    if [[ ! -d "$DOTNET_INSTALL_DIR/sdk/$dotnet_sdk_version" ]]; then
@ -364,6 +366,11 @@ _script_dir=`dirname "$_ResolvePath"`
 eng_root=`cd -P "$_script_dir/.." && pwd`
 repo_root=`cd -P "$_script_dir/../.." && pwd`
 artifacts_dir="$repo_root/artifacts"
+if [[ -n "${ARCADE_PARTITION:-}" ]]; then
+  artifacts_dir="$repo_root/artifacts-$ARCADE_PARTITION"
+  export ArtifactsDir="$artifacts_dir/"
+fi
+
 toolset_dir="$artifacts_dir/toolset"
 tools_dir="$repo_root/.tools"
 log_dir="$artifacts_dir/log/$configuration"
--- a/eng/core-sdk-build-env.sh
+++ b/eng/core-sdk-build-env.sh
@ -0,0 +1,41 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) .NET Foundation and contributors. All rights reserved.
+# Licensed under the MIT license. See LICENSE file in the project root for full license information.
+#
+
+SOURCE="${BASH_SOURCE[0]}"
+while [ -h "$SOURCE" ]; do # resolve $SOURCE until the file is no longer a symlink
+  DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+  SOURCE="$(readlink "$SOURCE")"
+  [[ "$SOURCE" != /* ]] && SOURCE="$DIR/$SOURCE" # if $SOURCE was a relative symlink, we need to resolve it relative to the path where the symlink file was located
+done
+
+REPO_ROOT="$( cd -P "$( dirname "$SOURCE" )/../" && pwd )"
+
+arcade_partition=
+
+while [[ $# > 0 ]]; do
+  opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
+  case "$opt" in
+    -partition)
+      arcade_partition=$2
+      shift
+      ;;
+  esac
+
+  shift
+done
+
+export ARCADE_PARTITION=$arcade_partition
+
+if [[ ! -z "$arcade_partition" ]]; then
+  arcade_partition_suffix="-$arcade_partition"
+fi
+
+export PATH=$REPO_ROOT/.dotnet$arcade_partition_suffix:$PATH
+export DOTNET_INSTALL_DIR=$REPO_ROOT/.dotnet$arcade_partition_suffix
+export ArtifactsDir=$REPO_ROOT/artifacts$arcade_partition_suffix/
+
+export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
+export DOTNET_MULTILEVEL_LOOKUP=0
--- a/eng/dockerrun.ps1
+++ b/eng/dockerrun.ps1
@ -55,7 +55,6 @@ docker run $interactiveFlag -t --rm --sig-proxy=true `
  -e PB_PACKAGEVERSIONPROPSURL `
  -e PB_PUBLISHBLOBFEEDURL `
  -e EXTERNALRESTORESOURCES `
-  -e ARCADE_DOTNET_DIR="/opt/code/artifacts/docker/${dockerImageName}/.dotnet" `
-  -e ARCADE_ARTIFACTS_DIR="/opt/code/artifacts/docker/${dockerImageName}/" `
+  -e ARCADE_PARTITION="${dockerImageName}" `
  $dockerContainerTag `
  /opt/code/run-build.sh @additionalArgs
--- a/src/redist/targets/Versions.targets
+++ b/src/redist/targets/Versions.targets
@ -4,7 +4,7 @@
    <VersionMinor>0</VersionMinor>
    <VersionSDKMinor>1</VersionSDKMinor>
    <VersionPatch>00</VersionPatch>
-    <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">preview9</ReleaseSuffix>
+    <ReleaseSuffix Condition=" '$(ReleaseSuffix)' == '' ">rc1</ReleaseSuffix>
  </PropertyGroup>
  
  <Target Name="GetCoreSdkGitCommitInfo">
--- a/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
+++ b/src/redist/targets/packaging/windows/clisdk/LCID/1046/bundle.wxl
@ -51,9 +51,9 @@

 O seguinte foi instalado em: '[DOTNETHOME]'
    • SDK do .NET Core [DOTNETSDKVERSION]
-    • Tempo de Execução do .NET Core [DOTNETRUNTIMEVERSION]
-    • Tempo de Execução do ASP.NET Core [ASPNETCOREVERSION]
-    • Tempo de Execução da Área de Trabalho do Windows do .NET Core [WINFORMSANDWPFVERSION]
+    • Runtime do .NET Core [DOTNETRUNTIMEVERSION]
+    • Runtime do ASP.NET Core [ASPNETCOREVERSION]
+    • Runtime da Área de Trabalho do Windows do .NET Core [WINFORMSANDWPFVERSION]

 Este produto coleta dados de uso
    • Para obter mais informações e recusar, acesse https://aka.ms/dotnet-cli-telemetry
--- a/src/redist/targets/packaging/windows/clisdk/bundle.thm
+++ b/src/redist/targets/packaging/windows/clisdk/bundle.thm
@ -92,7 +92,7 @@
        <Text Name="FailureRepairHeader" X="11" Y="80" Width="-11" Height="30" FontId="2" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRepairHeader)</Text>
        <Hypertext Name="FailureLogFileLink" X="11" Y="121" Width="-11" Height="42" FontId="3" TabStop="yes" HideWhenDisabled="yes">#(loc.FailureHyperlinkLogText)</Hypertext>
        <Hypertext Name="FailureMessageText" X="22" Y="163" Width="-11" Height="51" FontId="3" TabStop="yes" HideWhenDisabled="yes" />
-        <Text Name="FailureRestartText" X="-11" Y="-40" Width="400" Height="23" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
+        <Text Name="FailureRestartText" X="-11" Y="-40" Width="400" Height="34" FontId="3" HideWhenDisabled="yes" DisablePrefix="yes">#(loc.FailureRestartText)</Text>
        <Button Name="FailureRestartButton" X="-131" Y="-11" Width="95" Height="23" TabStop="yes" FontId="0" HideWhenDisabled="yes">#(loc.FailureRestartButton)</Button>
        <Button Name="FailureCloseButton" X="-31" Y="-11" Width="95" Height="23" TabStop="yes" FontId="0">#(loc.FailureCloseButton)</Button>
    </Page>
--- a/test/SdkTests/SdkTests.csproj
+++ b/test/SdkTests/SdkTests.csproj
@ -0,0 +1,283 @@
+<Project>
+
+  <PropertyGroup>
+    <CopyBuildOutputToOutputDirectory>false</CopyBuildOutputToOutputDirectory>
+    <CopyOutputSymbolsToOutputDirectory>false</CopyOutputSymbolsToOutputDirectory>
+    <OutputType>Library</OutputType>
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <ResolvePackageDependenciesForBuild>false</ResolvePackageDependenciesForBuild>
+    <NonShipping>true</NonShipping>
+    <NoStdLib>true</NoStdLib>
+    <ProducesNoOutput>true</ProducesNoOutput>
+  </PropertyGroup>
+  
+  <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
+
+  <PropertyGroup>
+    <LanguageTargets>$(MSBuildToolsPath)\Microsoft.CSharp.targets</LanguageTargets>
+
+    <IsPackable>false</IsPackable>
+
+    <DeterministicSourcePaths>false</DeterministicSourcePaths>
+    <TargetFramework>$(CoreSdkTargetFramework)</TargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <RedistLayoutPath>$(ArtifactsBinDir)redist\$(Configuration)\dotnet\</RedistLayoutPath>
+    <DotnetToTestPath>$(ArtifactsBinDir)redist\$(Configuration)\dotnet-with-previous-runtimes\</DotnetToTestPath>
+    <TestExecutionDirectory>$([MSBuild]::NormalizePath($(ArtifactsTmpDir), 'dotnetSdkTests'))</TestExecutionDirectory>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <SdkTest Include="Build" />
+    <SdkTest Include="Clean" />
+    <SdkTest Include="Pack" />
+    <SdkTest Include="Publish" />
+    <SdkTest Include="Rebuild" />
+    <SdkTest Include="Restore" />
+    <SdkTest Include="ToolPack" />
+  </ItemGroup>
+
+  <Target Name="GetRuntimesToInstall">
+    <PropertyGroup>
+      <Supports1xRuntimes>true</Supports1xRuntimes>
+    </PropertyGroup>
+
+    <ReadLinesFromFile File="/etc/os-release"
+                       Condition="'$(OS)' != 'Windows_NT'">
+      <Output TaskParameter="Lines" PropertyName="OsReleaseContents"/>
+    </ReadLinesFromFile>
+
+    <!-- Set OsReleaseContents to Windows to make later comparisons easier -->
+    <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
+      <OsReleaseContents>Windows</OsReleaseContents>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="$(OsReleaseContents.Contains('NAME=%22Ubuntu%22'))">
+      <Supports1xRuntimes Condition="$(OsReleaseContents.Contains('VERSION_ID=%2218.04%22'))">false</Supports1xRuntimes>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="$(OsReleaseContents.Contains('NAME=Fedora'))">
+      <Supports1xRuntimes>false</Supports1xRuntimes>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="$(OsReleaseContents.Contains('NAME=%22openSUSE Leap%22'))">
+      <Supports1xRuntimes>false</Supports1xRuntimes>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="$(OsReleaseContents.Contains('NAME=%22Alpine Linux%22'))">
+      <Supports1xRuntimes>false</Supports1xRuntimes>
+    </PropertyGroup>
+
+    <!-- RHEL 6 does not appear to have the os-release file -->
+    <PropertyGroup Condition="'$(OsReleaseContents)' == ''">
+      <Supports1xRuntimes>false</Supports1xRuntimes>
+    </PropertyGroup>
+
+    <ItemGroup Condition="'$(Supports1xRuntimes)' == 'true'">
+      <RuntimeVersionToInstall Include="1.0.5" />
+      <RuntimeVersionToInstall Include="1.1.2" />      
+    </ItemGroup>
+    <ItemGroup>
+      <RuntimeVersionToInstall Include="2.1.0" />
+      <RuntimeVersionToInstall Include="2.2.5" />
+    </ItemGroup>
+    
+  </Target>
+
+  <Target Name="SetupLayoutWithPreviousRuntimes" DependsOnTargets="GetRuntimesToInstall">
+    <ItemGroup>
+      <LayoutFilesToCopyToDotnetToTest Include="$(RedistLayoutPath)**"/>
+      <LayoutFilesToCopyToDotnetToTest>
+        <DestinationPath>$(DotnetToTestPath)%(RecursiveDir)%(Filename)%(Extension)</DestinationPath>
+      </LayoutFilesToCopyToDotnetToTest>
+    </ItemGroup>
+    <Copy SourceFiles="@(LayoutFilesToCopyToDotnetToTest)"
+          DestinationFiles="@(LayoutFilesToCopyToDotnetToTest->'%(DestinationPath)')"
+          SkipUnchangedFiles="true"/>
+
+    <MSBuild Projects="$(MSBuildProjectFullPath)"
+         Targets="InstallRuntimeToLayout"
+         Properties="RuntimeVersionToInstall=%(RuntimeVersionToInstall.Identity)"
+         BuildInParallel="false"/>
+  </Target>
+
+  <Target Name="InstallRuntimeToLayout">
+    <PropertyGroup>
+      <RuntimeTargetDirectory>$(DotnetToTestPath)shared\Microsoft.NETCore.App\$(RuntimeVersionToInstall)</RuntimeTargetDirectory>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
+      <InstallRuntimeCommand>powershell -NoLogo -NoProfile -ExecutionPolicy ByPass</InstallRuntimeCommand>
+      <InstallRuntimeCommand>$(InstallRuntimeCommand) "$(_DotNetRoot)dotnet-install.ps1"</InstallRuntimeCommand>
+      <InstallRuntimeCommand>$(InstallRuntimeCommand) -Version $(RuntimeVersionToInstall)</InstallRuntimeCommand>
+      <InstallRuntimeCommand>$(InstallRuntimeCommand) -InstallDir $(DotnetToTestPath)</InstallRuntimeCommand>
+      <InstallRuntimeCommand>$(InstallRuntimeCommand) -Runtime "dotnet"</InstallRuntimeCommand>
+      <InstallRuntimeCommand Condition="'$(Architecture)' != ''">$(InstallRuntimeCommand) -Architecture "$(Architecture)"</InstallRuntimeCommand>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
+      <InstallRuntimeCommand>/bin/bash</InstallRuntimeCommand>
+      <InstallRuntimeCommand>$(InstallRuntimeCommand) "$(_DotNetRoot)dotnet-install.sh"</InstallRuntimeCommand>
+      <InstallRuntimeCommand>$(InstallRuntimeCommand) --version $(RuntimeVersionToInstall)</InstallRuntimeCommand>
+      <InstallRuntimeCommand>$(InstallRuntimeCommand) --install-dir "$(DotnetToTestPath)"</InstallRuntimeCommand>
+      <InstallRuntimeCommand>$(InstallRuntimeCommand) --runtime "dotnet"</InstallRuntimeCommand>
+      <InstallRuntimeCommand Condition="'$(Architecture)' != ''">$(InstallRuntimeCommand) --architecture "$(Architecture)"</InstallRuntimeCommand>
+    </PropertyGroup>
+
+    <Exec Command="$(InstallRuntimeCommand)"
+          Condition="!Exists($(RuntimeTargetDirectory))"
+          IgnoreStandardErrorWarningFormat="true"
+          />
+  </Target>
+
+  <Target Name="RunSdkTests" DependsOnTargets="SetupLayoutWithPreviousRuntimes">
+
+    <!-- Isolate test working directory from higher-level Directory.Build files -->
+    <Copy SourceFiles="$(RepoRoot)TestAssets\Directory.Build.props;$(RepoRoot)TestAssets\Directory.Build.targets"
+          DestinationFolder="$(TestExecutionDirectory)"
+          SkipUnchangedFiles="true"
+          />
+
+    <!-- Set up NuGet feeds -->
+    <PropertyGroup>
+      <GeneratedNuGetConfig>$(TestExecutionDirectory)\NuGet.config</GeneratedNuGetConfig>
+      <NugetConfigContents>
+        <![CDATA[
+<configuration>
+  <packageSources>
+    <add key="dotnet-core" value="https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json" />
+    <add key="dotnet-windowsdesktop" value="https://dotnetfeed.blob.core.windows.net/dotnet-windowsdesktop/index.json" />
+    <add key="aspnet-aspnetcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore/index.json" />
+    <add key="aspnet-aspnetcore-tooling" value="https://dotnetfeed.blob.core.windows.net/aspnet-aspnetcore-tooling/index.json" />
+    <add key="aspnet-entityframeworkcore" value="https://dotnetfeed.blob.core.windows.net/aspnet-entityframeworkcore/index.json" />
+    <add key="aspnet-extensions" value="https://dotnetfeed.blob.core.windows.net/aspnet-extensions/index.json" />
+  </packageSources>
+</configuration>
+        ]]>
+      </NugetConfigContents>
+    </PropertyGroup>
+
+    <WriteLinesToFile File="$(GeneratedNuGetConfig)"
+                  Lines="$(NugetConfigContents)"
+                  Overwrite="true" />
+
+    <!-- Allow test list to be overridden with ToolTestName property -->
+    <ItemGroup Condition="'$(ToolTestName)' != ''">
+      <SdkTest Remove="@(SdkTest)" />
+      <SdkTest Include="$(ToolTestName)" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <TestProjectToRun Include="$(MSBuildProjectFullPath)">
+        <AdditionalProperties>ToolTestName=%(SdkTest.Identity)</AdditionalProperties>
+      </TestProjectToRun>
+    </ItemGroup>
+    
+    <MSBuild Projects="@(TestProjectToRun)"
+             Targets="RunTestsAsTool"
+             BuildInParallel="true"
+             />
+  </Target>
+  
+  <Target Name="RunTestsAsTool">
+    <PropertyGroup>
+      <ToolCommandName>testSdk$(ToolTestName)</ToolCommandName>
+      <TestProjectName>Microsoft.NET.$(ToolTestName).Tests</TestProjectName>
+      <TestLocalToolFolder>$(ArtifactsTmpDir)$(ToolCommandName)\</TestLocalToolFolder>
+    </PropertyGroup>
+
+    <RemoveDir Directories="$(TestLocalToolFolder)" />
+    <MakeDir Directories="$(TestLocalToolFolder)" />
+
+    <MakeDir Directories="$(ArtifactsTestResultsDir)" />
+
+    <Exec Command="dotnet new tool-manifest"
+      WorkingDirectory="$(TestLocalToolFolder)"/>
+
+    <PropertyGroup>
+      <SdkTestPackageVersion>$(MicrosoftNETSdkPackageVersion)</SdkTestPackageVersion>
+      <SdkTestPackageFeed>https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json</SdkTestPackageFeed>
+      
+      <InstallToolCommand>dotnet tool install --local $(ToolCommandName)</InstallToolCommand>
+      
+      <InstallToolCommand>$(InstallToolCommand) --version $(SdkTestPackageVersion)</InstallToolCommand>
+      <InstallToolCommand>$(InstallToolCommand) --add-source $(SdkTestPackageFeed)</InstallToolCommand>
+
+
+    </PropertyGroup>
+    
+    <Exec Command="$(InstallToolCommand)"
+      WorkingDirectory="$(TestLocalToolFolder)"/>
+
+    <Exec Command="dotnet tool restore"
+      WorkingDirectory="$(TestLocalToolFolder)"/>
+
+    <PropertyGroup>
+      <ResultsXmlPath>$(ArtifactsTestResultsDir)$(TestProjectName).xml</ResultsXmlPath>
+      <ResultsHtmlPath>$(ArtifactsTestResultsDir)$(TestProjectName).html</ResultsHtmlPath>
+      <ResultsStdOutPath>$(ArtifactsLogDir)$(TestProjectName).log</ResultsStdOutPath>
+
+      <TestArgs>-noautoreporters -noRepoInference</TestArgs>
+      <TestArgs>$(TestArgs) -dotnetPath $(DotnetToTestPath)\dotnet</TestArgs>
+      <TestArgs>$(TestArgs) -testExecutionDirectory $(TestExecutionDirectory)</TestArgs>
+      <TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestConfig.xml"</TestArgs>
+      <TestArgs>$(TestArgs) -xml "$(ResultsXmlPath)"</TestArgs>
+      <TestArgs>$(TestArgs) -html "$(ResultsHtmlPath)" $(TestRunnerAdditionalArguments)</TestArgs>
+      <TestArgs>$(TestArgs) &gt; $(ResultsStdOutPath) 2&gt;&amp;1</TestArgs>
+      <TestArgs>$(TestArgs) -testList SdkIntegrationTests</TestArgs>
+    </PropertyGroup>
+
+
+    <PropertyGroup Condition="('$(OS)' == 'Windows_NT') And ('$(Architecture)' == 'x86')">
+      <!-- Add list of tests to skip on x86 -->
+      <TestArgs>$(TestArgs) -testConfigFile "$(MSBuildThisFileDirectory)TestsToSkipx86.xml"</TestArgs>
+    </PropertyGroup>
+
+    <PropertyGroup Condition="'$(OS)' == 'Windows_NT'">
+      <ToolRunPrefix>$(ToolRunPrefix)set MSBuildSDKsPath= &amp;&amp; </ToolRunPrefix>
+      <ToolRunPrefix>$(ToolRunPrefix)set DOTNET_HOST_PATH= &amp;&amp; </ToolRunPrefix>
+      <ToolRunPrefix>$(ToolRunPrefix)set DOTNET_INSTALLDIR= &amp;&amp; </ToolRunPrefix>      
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(OS)' != 'Windows_NT'">
+      <ToolRunPrefix>$(ToolRunPrefix)unset MSBuildSDKsPath &amp;&amp; </ToolRunPrefix>
+      <ToolRunPrefix>$(ToolRunPrefix)unset DOTNET_HOST_PATH &amp;&amp; </ToolRunPrefix>
+      <ToolRunPrefix>$(ToolRunPrefix)unset DOTNET_INSTALLDIR &amp;&amp; </ToolRunPrefix>
+    </PropertyGroup>
+
+    <Exec Command="$(ToolRunPrefix)dotnet tool run $(ToolCommandName) -- $(TestArgs)"
+          WorkingDirectory="$(TestLocalToolFolder)" />
+  </Target>
+  
+  <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
+
+  <!-- Remove items which light up build logic which could generate warnings / errors -->
+  <ItemGroup>
+    <EmbeddedResource Remove="@(EmbeddedResource)" />
+    <Reference Remove="@(Reference)" />
+    <PackageReference Remove="@(PackageReference)" />
+    <ProjectReference Remove="@(ProjectReference)" />
+    <SwrFile Remove="@(SwrFile)" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <TargetPath></TargetPath>
+    <!-- Prevent projects referencing this from trying to pass us to the compiler -->
+  </PropertyGroup>
+
+  <Target Name="CoreCompile" />
+  <!-- Prevent Csc from being called -->
+  <Target Name="GenerateTargetFrameworkMonikerAttribute" />
+  <!-- Don't generate TFM attribute -->
+  <Target Name="RuntimeImplementationProjectOutputGroup" />
+  <!-- Group always attempts resolve runtime, regardless of <CopyNuGetImplementations>-->
+  <Target Name="GetReferenceAssemblyPaths" />
+  <!-- Don't go looking for framewoek reference assemblies-->
+  <Target Name="GetFrameworkPaths"  />
+  <!-- ^ -->
+
+  <Target Name="GetBuildVersion" />
+  <!-- For Packages projects, which use GetNuGetPackageVersionEx which depends on GetBuildVersion -->
+  <Target Name="Pack" />
+
+  <Target Name="Test" DependsOnTargets="RunSdkTests" />
+</Project>
--- a/test/SdkTests/TestConfig.xml
+++ b/test/SdkTests/TestConfig.xml
@ -0,0 +1,145 @@
+<Tests>
+  <TestList Name="SdkIntegrationTests">
+    <!-- Build tests -->
+    <Method Name="Microsoft.NET.Build.Tests.AppHostTests.It_builds_a_runnable_apphost_by_default" />
+    <Class Name="Microsoft.NET.Build.Tests.DesignTimeBuildTests" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TransitiveFrameworkReferenceFromPackageReference" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TransitiveFrameworkReferenceFromProjectReference" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.WPFFrameworkReference" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.WindowsDesktopFrameworkReference" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.WindowsFormAndWPFFrameworkReference" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.WindowsFormsFrameworkReference" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantBuildsToBeIncremental.ResolvePackageAssets_runs_incrementally" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildADesktopExe.It_builds_a_simple_desktop_app" />
+    <Class Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildADesktopExeWithFSharp" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildALibrary.It_builds_the_library_successfully" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildALibraryWithFSharp.It_builds_the_library_successfully" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildALibraryWithVB.It_builds_the_library_successfully" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.BuildWithTransitiveReferenceToNetCoreAppPackage" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_from_the_output_folder" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_with_conflicts_from_the_output_folder" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_the_app_from_the_output_folder" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_the_app_with_conflicts_from_the_output_folder" />
+    <Class Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetStandard2Library" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildASelfContainedApp.It_builds_a_runnable_output" />
+    <Class Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAUnitTestProject" />
+    <Class Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrariesAndRid" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithTransitiveProjectRefs.It_builds_the_project_successfully" />
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToResolveConflicts.FilesFromAspNetCoreSharedFrameworkAreNotIncluded" />
+    <Class Name="Microsoft.NET.Build.Tests.GivenThatWeWantToUseVB" />
+    <Class Name="Microsoft.NET.Build.Tests.GivenWeWantToRequireWindowsForDesktopApps" />
+    
+    <!-- Publish tests -->
+    <Class Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp" />
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAHelloWorldProject.It_publishes_portable_apps_to_the_publish_folder_and_the_app_should_run" />
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAHelloWorldProject.It_publishes_self_contained_apps_to_the_publish_folder_and_the_app_should_run" />
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAHelloWorldProject.It_publishes_with_a_publish_profile" />
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASelfContainedApp.It_can_make_a_Windows_GUI_exe" />
+    <Class Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishASingleFileApp" />
+    <Class Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAWebApp" />
+    <Class Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunCrossgen" />
+    <Class Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToRunILLink" />
+    <Class Name="Microsoft.NET.Publish.Tests.PublishWebApp" />
+    <Class Name="Microsoft.NET.Publish.Tests.PublishWpfApp" />
+    
+  </TestList>
+  
+  <SkippedTests>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAHelloWorldProject.It_publishes_portable_apps_to_the_publish_folder_and_the_app_should_run"
+            Skip="true"
+            Issue="https://github.com/dotnet/sdk/pull/3574"
+            Reason="Test update needed (in PR)"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.RuntimeFrameworkVersionCanBeSpecifiedOnFrameworkReference"
+            Skip="true"
+            Issue="https://github.com/dotnet/sdk/pull/3221"
+            Reason="Code flow needed"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TargetingPackVersionCanBeSpecifiedOnFrameworkReference"
+            Skip="true"
+            Issue="https://github.com/dotnet/sdk/pull/3221"
+            Reason="Code flow needed"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TargetLatestPatchCanBeSpecifiedOnFrameworkReference"
+            Skip="true"
+            Issue="https://github.com/dotnet/sdk/pull/3221"
+            Reason="Code flow needed"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TransitiveFrameworkReferenceFromPackageReference"
+            Skip="true"
+            Issue="https://github.com/dotnet/sdk/pull/3221"
+            Reason="Code flow needed"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenFrameworkReferences.TransitiveFrameworkReferenceFromProjectReference"
+            Skip="true"
+            Issue="https://github.com/dotnet/sdk/pull/3221"
+            Reason="Code flow needed"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToResolveConflicts.AProjectCanReferenceADllInAPackageDirectly"
+            Skip="true"
+            Issue="https://github.com/dotnet/sdk/pull/3214"
+            Reason="Code flow needed"/>
+
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPreserveCompilationContext.It_publishes_the_project_with_a_refs_folder_and_correct_deps_file"
+            Skip="true"
+            Issue="https://github.com/dotnet/sdk/pull/3237"
+            Reason="Code flow needed"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_targets_the_right_framework_depending_on_output_type"
+            Skip="true"
+            Issue=""
+            Reason="Test needs to be updated with new patches (along with SDK stage 0 update)"/>
+
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrariesAndRid.It_builds_a_RID_specific_runnable_output"
+            Skip="true"
+            Issue=""
+            Reason="Test doesn't work with newer RIDs"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrariesAndRid.It_builds_a_framework_dependent_RID_specific_runnable_output"
+            Skip="true"
+            Issue=""
+            Reason="Test doesn't work with newer RIDs"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_handles_mismatched_implicit_package_versions"
+            Skip="true"
+            Issue=""
+            Reason="Test doesn't work with newer RIDs"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithTransitiveProjectRefs.It_builds_the_project_successfully"
+            Skip="true"
+            Issue=""
+            Reason="Needs .NET Core 1.1"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrary.It_builds_the_project_successfully"
+            Skip="true"
+            Issue=""
+            Reason="Needs .NET Core 1.1"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildAnAppWithLibrary.It_builds_the_project_successfully_twice"
+            Skip="true"
+            Issue=""
+            Reason="Needs .NET Core 1.1"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantAllResourcesInSatellite.TestSatelliteResources"
+            Skip="true"
+            Issue=""
+            Reason="Needs .NET Core 1.1"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantAllResourcesInSatellite.It_retrieves_strings_successfully"
+            Skip="true"
+            Issue=""
+            Reason="Needs .NET Core 1.1"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenThereAreDefaultItems.Compile_items_can_be_explicitly_specified_while_default_EmbeddedResource_items_are_used"
+            Skip="true"
+            Issue=""
+            Reason="Needs .NET Core 1.1"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildASelfContainedApp.It_succeeds_when_RuntimeIdentifier_and_PlatformTarget_mismatch_but_PT_is_AnyCPU"
+            Skip="true"
+            Issue=""
+            Reason="Needs .NET Core 1.1"/>
+    
+  </SkippedTests>
+</Tests>
--- a/test/SdkTests/TestsToSkipx86.xml
+++ b/test/SdkTests/TestsToSkipx86.xml
@ -0,0 +1,20 @@
+<Tests>
+  <SkippedTests>
+    <Method Name="Microsoft.NET.Publish.Tests.GivenThatWeWantToPublishAFrameworkDependentApp.It_publishes_with_or_without_apphost"
+            Skip="true"
+            Reason="Test assumes test process architecture is the same as architecture under test"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_with_conflicts_from_the_output_folder"
+          Skip="true"
+          Reason="Test assumes test process architecture is the same as architecture under test"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.GivenThatWeWantToBuildANetCoreApp.It_runs_a_rid_specific_app_from_the_output_folder"
+          Skip="true"
+          Reason="Test assumes test process architecture is the same as architecture under test"/>
+
+    <Method Name="Microsoft.NET.Build.Tests.AppHostTests.It_builds_a_runnable_apphost_by_default"
+          Skip="true"
+          Reason="Test assumes test process architecture is the same as architecture under test"/>
+
+  </SkippedTests>
+</Tests>