diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props index 84f29d892..abd378799 100644 --- a/build/DependencyVersions.props +++ b/build/DependencyVersions.props @@ -12,12 +12,12 @@ - 2.1.0-preview1-20170818-1 + 2.1.0-preview1-20170927-2 $(CLI_NETSDK_Version) - 4.4.0-preview1-4365 + 4.4.0-preview3-4475 2.0.0-preview3-25514-04 - 2.0.0-rel-20170815-630 + 2.0.0-rel-20170908-653 15.5.0-preview-20170923-02 $(CLI_SharedFrameworkVersion) $(CLI_SharedFrameworkVersion) diff --git a/build/Publish.targets b/build/Publish.targets index 0845c933d..c200c4c66 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -43,7 +43,11 @@ + Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/> + + diff --git a/scripts/obtain/dotnet-install.ps1 b/scripts/obtain/dotnet-install.ps1 index 0f7b0984b..b844693d1 100644 --- a/scripts/obtain/dotnet-install.ps1 +++ b/scripts/obtain/dotnet-install.ps1 @@ -172,7 +172,7 @@ function GetHTTPResponse([Uri] $Uri) # HttpClient is used vs Invoke-WebRequest in order to support Nano Server which doesn't support the Invoke-WebRequest cmdlet. Load-Assembly -Assembly System.Net.Http - if( -not $ProxyAddress) { + if(-not $ProxyAddress) { try { # Despite no proxy being explicitly specified, we may still be behind a default proxy $DefaultProxy = [System.Net.WebRequest]::DefaultWebProxy; diff --git a/scripts/obtain/dotnet-install.sh b/scripts/obtain/dotnet-install.sh index c098902a9..3d66ade8b 100755 --- a/scripts/obtain/dotnet-install.sh +++ b/scripts/obtain/dotnet-install.sh @@ -55,6 +55,9 @@ say_verbose() { fi } +# This platform list is finite - if the SDK/Runtime has supported Linux distribution-specific assets, +# then and only then should the Linux distribution appear in this list. +# Adding a Linux distribution to this list does not imply distribution-specific support. get_os_download_name_from_platform() { eval $invocation @@ -315,7 +318,7 @@ get_normalized_architecture_from_architecture() { get_version_from_version_info() { eval $invocation - cat | tail -n 1 + cat | tail -n 1 | sed 's/\r$//' return 0 } @@ -324,7 +327,7 @@ get_version_from_version_info() { get_commit_hash_from_version_info() { eval $invocation - cat | head -n 1 + cat | head -n 1 | sed 's/\r$//' return 0 } @@ -675,8 +678,9 @@ install_dotnet() { say_verbose "Zip path: $zip_path" say "Downloading link: $download_link" - # Failures are expected in the non-legacy case. Do not output to stderr, since - # the output stderr are considered an error + + # Failures are normal in the non-legacy case for ultimately legacy downloads. + # Do not output to stderr, since output to stderr is considered an error. download "$download_link" $zip_path 2>&1 || download_failed=true # if the download fails, download the legacy_download_link