Merge pull request #6925 from dotnet/merges/release/2.0.0-to-master-20170619-070044

Merge release/2.0.0 to master

Microsoft.DotNet.Cli.sln

@@ -59,6 +59,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4
 		build\Test.targets = build\Test.targets
 		build\Version.props = build\Version.props
 		build\VersionBadge.props = build\VersionBadge.props
+		build\DerivedHostMachineInfo.props = build\DerivedHostMachineInfo.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "package", "package", "{FD7D515A-D10F-4F49-B8AE-21CF7ED071AE}"

build/BundledRuntimes.props

@@ -32,6 +32,8 @@
 
   <PropertyGroup>
     <AspNetCoreRuntimeInstallerBlobRootUrl>$(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeVersion)</AspNetCoreRuntimeInstallerBlobRootUrl>
+    <AspNetCoreSharedRuntimeVersionFileName>runtime.version</AspNetCoreSharedRuntimeVersionFileName>
+    <AspNetCoreSharedRuntimeVersionFile Condition=" '$(AspNetCoreSharedRuntimeVersionFileName)' != '' ">$(PackagesDirectory)/$(AspNetCoreSharedRuntimeVersionFileName)</AspNetCoreSharedRuntimeVersionFile>
     
     <!-- Examples:    Build.RS.linux.zip    Build.RS.winx86.zip    AspNetCorePackageStoreLibx64.wixlib   -->
     <AspNetCoreRuntimeInstallerArchiveFileNameOSToken Condition=" '$(HostOSName)' == 'win' ">$(HostOSName)$(Architecture)</AspNetCoreRuntimeInstallerArchiveFileNameOSToken>
@@ -90,5 +92,12 @@
       <ExtractDestination>$(AspNetRuntimePackageStorePublishDirectory)</ExtractDestination>
   </_DownloadAndExtractItem>
 
+  <_DownloadAndExtractItem Include="AspNetCoreSharedRuntimeVersionFile"
+                           Condition="!Exists('$(AspNetCoreSharedRuntimeVersionFile)')">
+      <Url>$(AspNetCoreRuntimeInstallerBlobRootUrl)/$(AspNetCoreSharedRuntimeVersionFileName)</Url>
+      <DownloadFileName>$(AspNetCoreSharedRuntimeVersionFile)</DownloadFileName>
+      <ExtractDestination></ExtractDestination>
+    </_DownloadAndExtractItem>
+
   </ItemGroup>
 </Project>

build/DependencyVersions.props

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <CLI_SharedFrameworkVersion>2.0.0-preview2-25407-01</CLI_SharedFrameworkVersion>
+    <CLI_SharedFrameworkVersion>2.0.0-preview3-25415-01</CLI_SharedFrameworkVersion>
     <CLI_MSBuild_Version>15.3.0-preview-000388-01</CLI_MSBuild_Version>
     <CLI_Roslyn_Version>2.3.0-beta3-61814-09</CLI_Roslyn_Version>
     <CLI_DiaSymNative_Version>1.6.0-beta2-25304</CLI_DiaSymNative_Version>
@@ -10,7 +10,7 @@
     <!-- We'll usually want to keep these versions in sync, but we may want to diverge in some
          cases, so use separate properties but derive one from the other unless we want to
          explicitly use different versions. -->
-    <CLI_NETSDK_Version>2.0.0-preview2-20170614-1</CLI_NETSDK_Version>
+    <CLI_NETSDK_Version>2.0.0-preview2-20170615-7</CLI_NETSDK_Version>
     <CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
     
     <CLI_NuGet_Version>4.3.0-preview3-4168</CLI_NuGet_Version>
@@ -23,8 +23,8 @@
     <TemplateEngineVersion>1.0.0-beta2-20170608-254</TemplateEngineVersion>
     <TemplateEngineTemplateVersion>1.0.0-beta2-20170612-258</TemplateEngineTemplateVersion>
     <TemplateEngineTemplate2_0Version>1.0.0-beta2-20170612-258</TemplateEngineTemplate2_0Version>
-    <PlatformAbstractionsVersion>2.0.0-preview2-25407-01</PlatformAbstractionsVersion>
+    <PlatformAbstractionsVersion>2.0.0-preview3-25415-01</PlatformAbstractionsVersion>
-    <DependencyModelVersion>2.0.0-preview2-25407-01</DependencyModelVersion>
+    <DependencyModelVersion>2.0.0-preview3-25415-01</DependencyModelVersion>
     <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
     <CliMigrateVersion>1.2.1-alpha-002133</CliMigrateVersion>
     <MicroBuildVersion>0.2.0</MicroBuildVersion>

build/DerivedHostMachineInfo.props

@@ -0,0 +1,7 @@
+<Project>
+    <PropertyGroup>
+      <IsDebianBaseDistro Condition=" '$(HostOSName)' == 'ubuntu' OR '$(HostOSName)' == 'debian' ">true</IsDebianBaseDistro>
+      <IsRPMBasedDistro Condition=" $(HostRid.StartsWith('rhel')) ">true</IsRPMBasedDistro>
+      <IsLinuxDistroSpecific Condition=" ('$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true') AND '$(IslinuxPortable)' != 'true' ">true</IsLinuxDistroSpecific>
+    </PropertyGroup>
+</Project>

build/FileExtensions.props

@@ -1,20 +1,17 @@
 <Project>
     <PropertyGroup>
-      <IsDebianBaseDistro Condition=" '$(HostOSName)' == 'ubuntu' OR '$(HostOSName)' == 'debian' ">True</IsDebianBaseDistro>
-      <IsRPMBasedDistro Condition=" $(HostRid.StartsWith('rhel')) ">True</IsRPMBasedDistro>
-
       <ArchiveExtension Condition=" '$(HostOSName)' == 'win' ">.zip</ArchiveExtension>
       <ArchiveExtension Condition=" '$(HostOSName)' != 'win' ">.tar.gz</ArchiveExtension>
 
       <InstallerExtension Condition=" '$(HostOSName)' == 'win' ">.msi</InstallerExtension>
       <InstallerExtension Condition=" '$(HostOSName)' == 'osx' ">.pkg</InstallerExtension>
-      <InstallerExtension Condition=" '$(IsDebianBaseDistro)' == 'True' ">.deb</InstallerExtension>
+      <InstallerExtension Condition=" '$(IsDebianBaseDistro)' == 'true' ">.deb</InstallerExtension>
-      <InstallerExtension Condition=" '$(IsRPMBasedDistro)' == True ">.rpm</InstallerExtension>
+      <InstallerExtension Condition=" '$(IsRPMBasedDistro)' == true ">.rpm</InstallerExtension>
 
       <BundleExtension Condition=" '$(HostOSName)' == 'win' ">.exe</BundleExtension>
       <BundleExtension Condition=" '$(HostOSName)' == 'osx' ">$(InstallerExtension)</BundleExtension>
-      <BundleExtension Condition=" '$(IsDebianBaseDistro)' == 'True' ">$(InstallerExtension)</BundleExtension>
+      <BundleExtension Condition=" '$(IsDebianBaseDistro)' == 'true' ">$(InstallerExtension)</BundleExtension>
-      <BundleExtension Condition=" '$(IsRPMBasedDistro)' == True ">$(InstallerExtension)</BundleExtension>
+      <BundleExtension Condition=" '$(IsRPMBasedDistro)' == true ">$(InstallerExtension)</BundleExtension>
 
       <DynamicLibPrefix>lib</DynamicLibPrefix>
       <DynamicLibPrefix Condition=" '$(HostOSName)' == 'win' "></DynamicLibPrefix>

build/Publish.targets

@@ -26,9 +26,12 @@
 
   <Target Name="GatherItemsForPattern">
     <ItemGroup>
-      <ForPublishing Include="@(GeneratedInstallers)" />
+      <ForPublishing Include="@(GeneratedInstallers)"
-      <ForPublishing Include="%(GenerateArchivesInputsOutputs.Outputs)" />
+                     Condition=" '$(IslinuxPortable)' != 'true' "/>
-      <ForPublishing Include="$(PackagesDirectory)/Microsoft*.nupkg" Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' " />
+      <ForPublishing Include="%(GenerateArchivesInputsOutputs.Outputs)"
+                     Condition=" '$(IsLinuxDistroSpecific)' != 'true' "/>
+      <ForPublishing Include="$(PackagesDirectory)/Microsoft*.nupkg"
+                     Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(IsLinuxDistroSpecific)' != 'true'"/>
     </ItemGroup>
 
     <ItemGroup>

build/package/Installer.DEB.proj

@@ -99,6 +99,7 @@
 
   <Target Name="TestSdkDeb"
       Condition=" '$(IsDebianBaseDistro)' == 'True' and '$(DebuildPresent)'  == 'true' "
+      DependsOnTargets="RestoreTests"
       Inputs="$(DownloadedSharedHostInstallerFile);
               $(DownloadedHostFxrInstallerFile);
               $(DownloadedSharedFrameworkInstallerFile);

build/package/Installer.RPM.targets

@@ -182,6 +182,7 @@
   </Target>
 
   <Target Name="TestSdkRpm"
+          DependsOnTargets="RestoreTests"
           Condition=" '$(IsRPMBasedDistro)' == 'True' and '$(FPMPresent)' == 'True' "
           Inputs="$(DownloadedSharedHostInstallerFile);
               $(DownloadedHostFxrInstallerFile);

build/publish/FinishBuild.targets

@@ -2,6 +2,7 @@
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Target Name="FinishBuild"
           DependsOnTargets="CheckIfAllBuildsHavePublished;
+                            EvaluateRuntimeCoherence;
                             FinalizeBuild" />
 
   <Target Name="CheckIfAllBuildsHavePublished">
@@ -14,6 +15,27 @@
     </CheckIfAllBuildsHavePublished>
   </Target>
 
+  <Target Name="EvaluateRuntimeCoherence"
+        DependsOnTargets="ReadAspNetCoreSharedRuntimeVersionFile"
+        BeforeTargets="FinalizeBuild">
+    <PropertyGroup>
+      <Coherent>false</Coherent>
+      <Coherent Condition=" '$(CLI_SharedFrameworkVersion)' == '@(AspNetCoreSharedRuntimeVersion)' ">true</Coherent>
+    </PropertyGroup>
+  </Target>
+
+  <Target Name="ReadAspNetCoreSharedRuntimeVersionFile"
+          DependsOnTargets="DownloadHostAndSharedFxArtifacts">
+    <ItemGroup>
+      <File Include="$(AspNetCoreSharedRuntimeVersionFile)" />
+    </ItemGroup>
+    <ReadLinesFromFile File="@(File)">
+      <Output
+          TaskParameter="Lines"
+          ItemName="AspNetCoreSharedRuntimeVersion"/>
+    </ReadLinesFromFile>
+  </Target>
+  
   <Target Name="FinalizeBuild"
           Condition=" '$(HaveAllBuildsPublished)' == 'True' ">
     <CopyBlobsToLatest AccountName="$(ArtifactCloudDropAccountName)"
@@ -21,14 +43,16 @@
                        ContainerName="$(ArtifactContainerName)"
                        NugetVersion="$(FullNugetVersion)"
                        Channel="$(Channel)"
-                       CommitHash="$(CommitHash)" />
+                       CommitHash="$(CommitHash)"
+                       Coherent="$(Coherent)" />
 
     <CopyBlobsToLatest AccountName="$(ChecksumCloudDropAccountName)"
                        AccountKey="$(ChecksumCloudDropAccessToken)"
                        ContainerName="$(ChecksumContainerName)"
                        NugetVersion="$(FullNugetVersion)"
                        Channel="$(Channel)"
-                       CommitHash="$(CommitHash)" />
+                       CommitHash="$(CommitHash)"
+                       Coherent="$(Coherent)" />
 
     <!-- Uncomment the line below when https://github.com/dotnet/buildtools/issues/1547 gets fixed. -->
     <!-- <UpdateVersionsRepo BranchName="$(BranchName)"

build_projects/dotnet-cli-build/CopyBlobsToLatest.cs

@@ -31,6 +31,8 @@ namespace Microsoft.DotNet.Cli.Build
         [Required]
         public string NugetVersion { get; set; }
 
+        public bool Coherent { get; set; }
+
         private AzurePublisher AzurePublisherTool
         {
             get
@@ -81,6 +83,10 @@ namespace Microsoft.DotNet.Cli.Build
 
                 string cliVersion = Utils.GetVersionFileContent(CommitHash, NugetVersion);
                 AzurePublisherTool.PublishStringToBlob($"{targetFolder}/latest.version", cliVersion);
+                if (Coherent == true)
+                {
+                    AzurePublisherTool.PublishStringToBlob($"{targetFolder}/latest.coherent.version", cliVersion);
+                }
             }
             finally
             {

dir.props

@@ -28,6 +28,7 @@
   <Import Project="build/Version.props" />
   <Import Project="build/Branding.props" />
 
+  <Import Project="build/DerivedHostMachineInfo.props" />
   <Import Project="build/FileExtensions.props" />
   <Import Project="build/InputDirectories.props" />
   <Import Project="build/MSBuildExtensions.props" />

run-build.sh

@@ -104,7 +104,7 @@ while [[ $# > 0 ]]; do
             ;;
         --linux-portable)
             LINUX_PORTABLE_INSTALL_ARGS="--runtime-id linux-x64"
-            CUSTOM_BUILD_ARGS="/p:Rid=\"linux-x64\" /p:OSName=\"linux\""
+            CUSTOM_BUILD_ARGS="/p:Rid=\"linux-x64\" /p:OSName=\"linux\" /p:IslinuxPortable=\"true\""
             args=( "${args[@]/$1}" )
             ;;
         --help)

scripts/obtain/dotnet-install.ps1

@@ -11,11 +11,19 @@
     it will update it only if the requested version differs from the one already installed.
 .PARAMETER Channel
     Default: LTS
-    Download from the Channel specified
+    Download from the Channel specified. Possible values:
+    - Current - most current release
+    - LTS - most current supported release
+    - 2-part version in a format A.B - represents a specific release
+          examples: 2.0; 1.0
+    - Branch name
+          examples: release/2.0.0; Master
 .PARAMETER Version
     Default: latest
     Represents a build version on specific channel. Possible values:
     - latest - most latest build on specific channel
+    - coherent - most latest coherent build on specific channel
+          coherent applies only to SDK downloads
     - 3-part version in a format A.B.C - represents specific version of build
           examples: 2.0.0-preview2-006120; 1.1.0
 .PARAMETER InstallDir
@@ -28,8 +36,6 @@
 .PARAMETER SharedRuntime
     Default: false
     Installs just the shared runtime bits, not the entire SDK
-.PARAMETER DebugSymbols
-    If set the installer will include symbols in the installation.
 .PARAMETER DryRun
     If set it will not perform installation but instead display what command line to use to consistently install
     currently requested version of dotnet cli. In example if you specify version 'latest' it will display a link
@@ -60,7 +66,6 @@ param(
    [string]$InstallDir="<auto>",
    [string]$Architecture="<auto>",
    [switch]$SharedRuntime,
-   [switch]$DebugSymbols, # TODO: Switch does not work yet. Symbols zip is not being uploaded yet.
    [switch]$DryRun,
    [switch]$NoPath,
    [string]$AzureFeed="https://dotnetcli.azureedge.net/dotnet",
@@ -207,16 +212,21 @@ function GetHTTPResponse([Uri] $Uri)
 }
 
 
-function Get-Latest-Version-Info([string]$AzureFeed, [string]$Channel) {
+function Get-Latest-Version-Info([string]$AzureFeed, [string]$Channel, [bool]$Coherent) {
     Say-Invocation $MyInvocation
 
     $VersionFileUrl = $null
     if ($SharedRuntime) {
         $VersionFileUrl = "$UncachedFeed/Runtime/$Channel/latest.version"
     }
+    else {
+        if ($Coherent) {
+            $VersionFileUrl = "$UncachedFeed/Sdk/$Channel/latest.coherent.version"
+        }
         else {
             $VersionFileUrl = "$UncachedFeed/Sdk/$Channel/latest.version"
         }
+    }
     
     $Response = GetHTTPResponse -Uri $VersionFileUrl
     $StringContent = $Response.Content.ReadAsStringAsync().Result
@@ -239,7 +249,11 @@ function Get-Specific-Version-From-Version([string]$AzureFeed, [string]$Channel,
 
     switch ($Version.ToLower()) {
         { $_ -eq "latest" } {
-            $LatestVersionInfo = Get-Latest-Version-Info -AzureFeed $AzureFeed -Channel $Channel
+            $LatestVersionInfo = Get-Latest-Version-Info -AzureFeed $AzureFeed -Channel $Channel -Coherent $False
+            return $LatestVersionInfo.Version
+        }
+        { $_ -eq "coherent" } {
+            $LatestVersionInfo = Get-Latest-Version-Info -AzureFeed $AzureFeed -Channel $Channel -Coherent $True
             return $LatestVersionInfo.Version
         }
         default { return $Version }
@@ -464,14 +478,17 @@ if ($free.Freespace / 1MB -le 100 ) {
 }
 
 $ZipPath = [System.IO.Path]::GetTempFileName()
-Say "Downloading $DownloadLink"
+Say-Verbose "Zip path: $ZipPath"
+Say "Downloading link: $DownloadLink"
 try {
     DownloadFile -Uri $DownloadLink -OutPath $ZipPath
 }
 catch {
+    Say "Cannot download: $DownloadLink"
     $DownloadLink = $LegacyDownloadLink
     $ZipPath = [System.IO.Path]::GetTempFileName()
-    Say "Downloading $DownloadLink"
+    Say-Verbose "Legacy zip path: $ZipPath"
+    Say "Downloading legacy link: $DownloadLink"
     DownloadFile -Uri $DownloadLink -OutPath $ZipPath
 }
 

scripts/obtain/dotnet-install.sh

@@ -147,7 +147,7 @@ get_distro_specific_os_name() {
         fi
     fi
     
-    say_verbose "Distribution specific OS name + version could not be detected: $ID.$VERSION_ID"
+    say_verbose "Distribution specific OS name and version could not be detected: $ID.$VERSION_ID"
     return 1
 }
 
@@ -339,13 +339,18 @@ get_latest_version_info() {
     local azure_feed=$1
     local channel=$2
     local normalized_architecture=$3
+    local coherent=$4
 
     local version_file_url=null
     if [ "$shared_runtime" = true ]; then
         version_file_url="$uncached_feed/Runtime/$channel/latest.version"
+    else
+        if [ "$coherent" = true ]; then
+            version_file_url="$uncached_feed/Runtime/$channel/latest.coherent.version"
         else
             version_file_url="$uncached_feed/Sdk/$channel/latest.version"
         fi
+    fi
     say_verbose "get_latest_version_info: latest url: $version_file_url"
     
     download $version_file_url
@@ -368,7 +373,14 @@ get_specific_version_from_version() {
     case $version in
         latest)
             local version_info
-            version_info="$(get_latest_version_info $azure_feed $channel $normalized_architecture)" || return 1
+            version_info="$(get_latest_version_info $azure_feed $channel $normalized_architecture false)" || return 1
+            say_verbose "get_specific_version_from_version: version_info=$version_info"
+            echo "$version_info" | get_version_from_version_info
+            return 0
+            ;;
+        coherent)
+            local version_info
+            version_info="$(get_latest_version_info $azure_feed $channel $normalized_architecture true)" || return 1
             say_verbose "get_specific_version_from_version: version_info=$version_info"
             echo "$version_info" | get_version_from_version_info
             return 0
@@ -647,13 +659,14 @@ install_dotnet() {
     #  if the download fails, download the legacy_download_link
     if [ "$download_failed" = true ] && [ "$valid_legacy_download_link" = true ]; then
         say "Cannot download: $download_link"
+        download_link=$legacy_download_link
         zip_path=$(mktemp $temporary_file_template)
         say_verbose "Legacy zip path: $zip_path"
-        say "Downloading legacy link: $legacy_download_link"
+        say "Downloading legacy link: $download_link"
-        download "$legacy_download_link" $zip_path
+        download "$download_link" $zip_path
     fi
     
-    say "Extracting zip"
+    say "Extracting zip from $download_link"
     extract_dotnet_package $zip_path $install_root
     
     return 0
@@ -667,7 +680,6 @@ channel="LTS"
 version="Latest"
 install_dir="<auto>"
 architecture="<auto>"
-debug_symbols=false
 dry_run=false
 no_path=false
 azure_feed="https://dotnetcli.azureedge.net/dotnet"
@@ -699,9 +711,6 @@ do
         --shared-runtime|-[Ss]hared[Rr]untime)
             shared_runtime=true
             ;;
-        --debug-symbols|-[Dd]ebug[Ss]ymbols)
-            debug_symbols=true
-            ;;
         --dry-run|-[Dd]ry[Rr]un)
             dry_run=true
             ;;
@@ -732,17 +741,29 @@ do
             echo "$script_name is a simple command line interface for obtaining dotnet cli."
             echo ""
             echo "Options:"
-            echo "  -c,--channel <CHANNEL>         Download from the CHANNEL specified (default: $channel)."
+            echo "  -c,--channel <CHANNEL>         Download from the CHANNEL specified, Defaults to \`$channel\`."
             echo "      -Channel"
-            echo "  -v,--version <VERSION>         Use specific version, or \`latest\`. Defaults to \`latest\`."
+            echo "          Possible values:"
+            echo "          - Current - most current release"
+            echo "          - LTS - most current supported release"
+            echo "          - 2-part version in a format A.B - represents a specific release"
+            echo "              examples: 2.0; 1.0"
+            echo "          - Branch name"
+            echo "              examples: release/2.0.0; Master"
+            echo "  -v,--version <VERSION>         Use specific VERSION, Defaults to \`$version\`."
             echo "      -Version"
+            echo "          Possible values:"
+            echo "          - latest - most latest build on specific channel"
+            echo "          - coherent - most latest coherent build on specific channel"
+            echo "              coherent applies only to SDK downloads"
+            echo "          - 3-part version in a format A.B.C - represents specific version of build"
+            echo "              examples: 2.0.0-preview2-006120; 1.1.0"
             echo "  -i,--install-dir <DIR>         Install under specified location (see Install Location below)"
             echo "      -InstallDir"
             echo "  --architecture <ARCHITECTURE>  Architecture of .NET Tools. Currently only x64 is supported."
             echo "      --arch,-Architecture,-Arch"
             echo "  --shared-runtime               Installs just the shared runtime bits, not the entire SDK."
             echo "      -SharedRuntime"
-            echo "  --debug-symbols,-DebugSymbols  Specifies if symbols should be included in the installation."
             echo "  --dry-run,-DryRun              Do not perform installation. Display download link."
             echo "  --no-path, -NoPath             Do not set PATH for the current process."
             echo "  --verbose,-Verbose             Display diagnostics information."

src/Microsoft.DotNet.Cli.Utils/AnsiConsole.cs

@@ -8,11 +8,14 @@ namespace Microsoft.DotNet.Cli.Utils
 {
     public class AnsiConsole
     {
+        private const int Light = 0x08;
+
         private AnsiConsole(TextWriter writer)
         {
             Writer = writer;
     
             OriginalForegroundColor = Console.ForegroundColor;
+            _boldRecursion = ((int)OriginalForegroundColor & Light) != 0 ? 1 : 0;
         }
     
         private int _boldRecursion;
@@ -33,7 +36,6 @@ namespace Microsoft.DotNet.Cli.Utils
     
         private void SetColor(ConsoleColor color)
         {
-            const int Light = 0x08;
             int c = (int)color;
 
             Console.ForegroundColor =