mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7713 from dotnet/merges/release/2.0.0-to-master-20170927-070027

Browse source 
Merge release/2.0.0 to master
This commit is contained in:
Livar 2017-09-27 20:11:43 -07:00 committed by GitHub
commit 6ed253299e
4 changed files with 17 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/DependencyVersions.props
View file

@ -12,12 +12,12 @@
<!-- 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.1.0-preview1-20170818-1</CLI_NETSDK_Version>
<CLI_NETSDK_Version>2.1.0-preview1-20170927-2</CLI_NETSDK_Version>
<CLI_MSBuildExtensions_Version>$(CLI_NETSDK_Version)</CLI_MSBuildExtensions_Version>
<CLI_NuGet_Version>4.4.0-preview1-4365</CLI_NuGet_Version>
<CLI_NuGet_Version>4.4.0-preview3-4475</CLI_NuGet_Version>
<CLI_NETStandardLibraryNETFrameworkVersion>2.0.0-preview3-25514-04</CLI_NETStandardLibraryNETFrameworkVersion>
<CLI_WEBSDK_Version>2.0.0-rel-20170815-630</CLI_WEBSDK_Version>
<CLI_WEBSDK_Version>2.0.0-rel-20170908-653</CLI_WEBSDK_Version>
<CLI_TestPlatform_Version>15.5.0-preview-20170923-02</CLI_TestPlatform_Version>
<SharedFrameworkVersion>$(CLI_SharedFrameworkVersion)</SharedFrameworkVersion>
<SharedHostVersion>$(CLI_SharedFrameworkVersion)</SharedHostVersion>

6
build/Publish.targets
View file

@ -43,7 +43,11 @@
<ForPublishing Include="%(GenerateArchivesInputsOutputs.Outputs)"
Condition=" '$(IsLinuxDistroSpecific)' != 'true' "/>
<ForPublishing Include="$(PackagesDirectory)/Microsoft*.nupkg"
Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(IsLinuxDistroSpecific)' != 'true'"/>
Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
<ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture)*.nupkg"
Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(OS)' == 'Windows_NT' "/>
<ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.MSBuildExtensions*.nupkg"
Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
</ItemGroup>
<ItemGroup>

2
scripts/obtain/dotnet-install.ps1 vendored
View file

@ -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;

12
scripts/obtain/dotnet-install.sh vendored
View file

@ -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