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

Move downloads to CDN (#3873)

Browse source
This commit is contained in:
Piotr Puszkiewicz 2016-07-15 15:36:01 -04:00 • committed by GitHub
parent 5059e9c61b
commit 89e127b8ac
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Documentation/specs/installation-scenarios.md
View file

@ -18,12 +18,12 @@ This section describes placeholders used inside this spec.
# Build Output # Build Output
Each official, successful build should create and upload packages to location described by following URLs: Each official, successful build should create and upload packages to location described by following URLs:
``` ```
https://dotnetcli.blob.core.windows.net/dotnet/<Channel>/<Version>/dotnet.<OSID>.<Version>.<Extension> https://dotnetcli.azureedge.net/dotnet/<Channel>/<Version>/dotnet.<OSID>.<Version>.<Extension>
Currently: Currently:
https://dotnetcli.blob.core.windows.net/dotnet/<Channel>/Binaries/<Version>/dotnet-sharedframework-<OSName>-<Architecture>.<Version>.zip https://dotnetcli.azureedge.net/dotnet/<Channel>/Binaries/<Version>/dotnet-sharedframework-<OSName>-<Architecture>.<Version>.zip
https://dotnetcli.blob.core.windows.net/dotnet/<Channel>/Binaries/<Version>/dotnet-host-<OSName>-<Architecture>.<Version>.zip https://dotnetcli.azureedge.net/dotnet/<Channel>/Binaries/<Version>/dotnet-host-<OSName>-<Architecture>.<Version>.zip
https://dotnetcli.blob.core.windows.net/dotnet/<Channel>/Binaries/<Version>/dotnet-<OSName>-<Architecture>.<Version>.zip https://dotnetcli.azureedge.net/dotnet/<Channel>/Binaries/<Version>/dotnet-<OSName>-<Architecture>.<Version>.zip
``` ```
Content of the package should contain binaries which layout will be described later. Content of the package should contain binaries which layout will be described later.
@ -105,7 +105,7 @@ WIP: Exact script action description.
| -DryRun | --dry-run | `<not set>` | If switch present, installation will not be performed and instead deterministic invocation with specific version and zip location will be displayed. | | -DryRun | --dry-run | `<not set>` | If switch present, installation will not be performed and instead deterministic invocation with specific version and zip location will be displayed. |
| -NoPath | --no-path | `<not set>` | If switch present the script will not set PATH environmental variable for the current process. | | -NoPath | --no-path | `<not set>` | If switch present the script will not set PATH environmental variable for the current process. |
| -Verbose | --verbose | `<not set>` | If switch present displays diagnostics information. | | -Verbose | --verbose | `<not set>` | If switch present displays diagnostics information. |
| -AzureFeed | --azure-feed | See description | Azure feed URL, default: `https://dotnetcli.blob.core.windows.net/dotnet` | | -AzureFeed | --azure-feed | See description | Azure feed URL, default: `https://dotnetcli.azureedge.net/dotnet` |
### Script location ### Script location
WIP: permanent link for obtaining latest version WIP: permanent link for obtaining latest version
@ -143,7 +143,7 @@ Version files can be found in multiple places:
URL: URL:
``` ```
https://dotnetcli.blob.core.windows.net/dotnet/<Channel>/<VersionPointer>.<OSID>.version https://dotnetcli.azureedge.net/dotnet/<Channel>/<VersionPointer>.<OSID>.version
``` ```
### File content ### File content
@ -156,7 +156,7 @@ Each version file contains two lines describing the build:
## Version badge ## Version badge
Version badge (SVG) is an image with textual representation of `<Version>`. It can be found under following URL: Version badge (SVG) is an image with textual representation of `<Version>`. It can be found under following URL:
``` ```
https://dotnetcli.blob.core.windows.net/dotnet/<Channel>/<VersionPointer>.<OSID>.svg https://dotnetcli.azureedge.net/dotnet/<Channel>/<VersionPointer>.<OSID>.svg
``` ```
## Questions/gaps ## Questions/gaps

2
build/Microsoft.DotNet.Cli.Prepare.targets
View file

@ -114,7 +114,7 @@
<Target Name="SetupDownloadHostAndSharedFxInputsOutputs" DependsOnTargets="Init"> <Target Name="SetupDownloadHostAndSharedFxInputsOutputs" DependsOnTargets="Init">
<PropertyGroup> <PropertyGroup>
<CoreSetupBlobRootUrl>https://dotnetcli.blob.core.windows.net/dotnet/$(CoreSetupChannel)</CoreSetupBlobRootUrl> <CoreSetupBlobRootUrl>https://dotnetcli.azureedge.net/dotnet/$(CoreSetupChannel)</CoreSetupBlobRootUrl>
<SharedFrameworkArchiveBlobRootUrl>$(CoreSetupBlobRootUrl)/Binaries/$(SharedFrameworkVersion)</SharedFrameworkArchiveBlobRootUrl> <SharedFrameworkArchiveBlobRootUrl>$(CoreSetupBlobRootUrl)/Binaries/$(SharedFrameworkVersion)</SharedFrameworkArchiveBlobRootUrl>
<CoreSetupInstallerBlobRootUrl>$(CoreSetupBlobRootUrl)/Installers</CoreSetupInstallerBlobRootUrl> <CoreSetupInstallerBlobRootUrl>$(CoreSetupBlobRootUrl)/Installers</CoreSetupInstallerBlobRootUrl>

2
build/package/Microsoft.DotNet.Cli.Installer.MSI.targets
View file

@ -9,7 +9,7 @@
<!-- AcquireWix Properties --> <!-- AcquireWix Properties -->
<PropertyGroup> <PropertyGroup>
<WixVersion>3.10.2</WixVersion> <WixVersion>3.10.2</WixVersion>
<WixDownloadUrl>https://dotnetcli.blob.core.windows.net/build/wix/wix.$(WixVersion).zip</WixDownloadUrl> <WixDownloadUrl>https://dotnetcli.azureedge.net/build/wix/wix.$(WixVersion).zip</WixDownloadUrl>
<WixRoot>$(IntermediateDirectory)/WixTools/$(WixVersion)</WixRoot> <WixRoot>$(IntermediateDirectory)/WixTools/$(WixVersion)</WixRoot>
<WixDestinationPath>$(WixRoot)/WixTools.$(WixVersion).zip</WixDestinationPath> <WixDestinationPath>$(WixRoot)/WixTools.$(WixVersion).zip</WixDestinationPath>
<WixDownloadSentinel>$(WixRoot)/WixDownload.$(WixVersion).sentinel</WixDownloadSentinel> <WixDownloadSentinel>$(WixRoot)/WixDownload.$(WixVersion).sentinel</WixDownloadSentinel>

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

@ -45,7 +45,7 @@
.PARAMETER Verbose .PARAMETER Verbose
Displays diagnostics information. Displays diagnostics information.
.PARAMETER AzureFeed .PARAMETER AzureFeed
Default: https://dotnetcli.blob.core.windows.net/dotnet Default: https://dotnetcli.azureedge.net/dotnet
This parameter should not be usually changed by user. It allows to change URL for the Azure feed used by this installer. This parameter should not be usually changed by user. It allows to change URL for the Azure feed used by this installer.
#> #>
[cmdletbinding()] [cmdletbinding()]
@ -58,7 +58,7 @@ param(
[switch]$DebugSymbols, # TODO: Switch does not work yet. Symbols zip is not being uploaded yet. [switch]$DebugSymbols, # TODO: Switch does not work yet. Symbols zip is not being uploaded yet.
[switch]$DryRun, [switch]$DryRun,
[switch]$NoPath, [switch]$NoPath,
[string]$AzureFeed="https://dotnetcli.blob.core.windows.net/dotnet" [string]$AzureFeed="https://dotnetcli.azureedge.net/dotnet"
) )
Set-StrictMode -Version Latest Set-StrictMode -Version Latest

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

@ -556,7 +556,7 @@ architecture="<auto>"
debug_symbols=false debug_symbols=false
dry_run=false dry_run=false
no_path=false no_path=false
azure_feed="https://dotnetcli.blob.core.windows.net/dotnet" azure_feed="https://dotnetcli.azureedge.net/dotnet"
verbose=false verbose=false
shared_runtime=false shared_runtime=false