From 2c8ea8263a2f795ef3f055edb9ebd1a868f14980 Mon Sep 17 00:00:00 2001 From: Davis Goodin Date: Mon, 14 Aug 2017 14:18:39 -0500 Subject: [PATCH 1/2] Skip versions repo publish if auth not defined (cherry picked from commit b4c1a809b883927e6103569feb8c4ac976d6131f) --- build/publish/FinishBuild.targets | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/publish/FinishBuild.targets b/build/publish/FinishBuild.targets index 2ec12d1d3..dfb224431 100644 --- a/build/publish/FinishBuild.targets +++ b/build/publish/FinishBuild.targets @@ -34,6 +34,7 @@ + GitHubPassword="$(GITHUB_PASSWORD)" + Condition=" '$(GITHUB_PASSWORD)' != '' " /> From 8c5e955252f93f54e239e5f1c978700b97fc21c1 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 14 Aug 2017 18:05:04 -0700 Subject: [PATCH 2/2] Fix dotnet-install script when latest version file for channel is returned as application/octet-stream --- scripts/obtain/dotnet-install.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/obtain/dotnet-install.ps1 b/scripts/obtain/dotnet-install.ps1 index 93d964540..427995b86 100644 --- a/scripts/obtain/dotnet-install.ps1 +++ b/scripts/obtain/dotnet-install.ps1 @@ -232,7 +232,7 @@ function Get-Latest-Version-Info([string]$AzureFeed, [string]$Channel, [bool]$Co $StringContent = $Response.Content.ReadAsStringAsync().Result switch ($Response.Content.Headers.ContentType) { - { ($_ -eq "application/octet-stream") } { $VersionText = [Text.Encoding]::UTF8.GetString($StringContent) } + { ($_ -eq "application/octet-stream") } { $VersionText = $StringContent } { ($_ -eq "text/plain") } { $VersionText = $StringContent } { ($_ -eq "text/plain; charset=UTF-8") } { $VersionText = $StringContent } default { throw "``$Response.Content.Headers.ContentType`` is an unknown .version file content type." }