Merge remote-tracking branch 'refs/remotes/origin/feature/msbuild'
Conflicts: Microsoft.DotNet.Cli.sln build_projects/dotnet-cli-build/DebTargets.cs build_projects/dotnet-cli-build/TestTargets.cs scripts/package/package-debian.sh src/Microsoft.Extensions.DependencyModel/DependencyContextJsonReader.cs src/dotnet/commands/dotnet-new/Program.cs src/dotnet/commands/dotnet-pack/PackageGenerator.cs test/Microsoft.Extensions.DependencyModel.Tests/DependencyContextJsonReaderTest.cs
This commit is contained in:
commit
2db1997bc0
450 changed files with 7134 additions and 18741 deletions
|
@ -126,5 +126,8 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \
|
|||
-e NUGET_FEED_URL \
|
||||
-e NUGET_API_KEY \
|
||||
-e GITHUB_PASSWORD \
|
||||
-e STORAGE_KEY \
|
||||
-e STORAGE_ACCOUNT \
|
||||
-e STORAGE_CONTAINER \
|
||||
$DOTNET_BUILD_CONTAINER_TAG \
|
||||
$BUILD_COMMAND "$@"
|
||||
|
|
9
scripts/obtain/dotnet-install.ps1
vendored
9
scripts/obtain/dotnet-install.ps1
vendored
|
@ -45,7 +45,7 @@
|
|||
.PARAMETER Verbose
|
||||
Displays diagnostics information.
|
||||
.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.
|
||||
#>
|
||||
[cmdletbinding()]
|
||||
|
@ -58,7 +58,8 @@ param(
|
|||
[switch]$DebugSymbols, # TODO: Switch does not work yet. Symbols zip is not being uploaded yet.
|
||||
[switch]$DryRun,
|
||||
[switch]$NoPath,
|
||||
[string]$AzureFeed="https://dotnetcli.blob.core.windows.net/dotnet"
|
||||
[string]$AzureFeed="https://dotnetcli.azureedge.net/dotnet",
|
||||
[string]$UncachedFeed="https://dotnetcli.blob.core.windows.net/dotnet"
|
||||
)
|
||||
|
||||
Set-StrictMode -Version Latest
|
||||
|
@ -130,10 +131,10 @@ function Get-Latest-Version-Info([string]$AzureFeed, [string]$AzureChannel, [str
|
|||
|
||||
$VersionFileUrl = $null
|
||||
if ($SharedRuntime) {
|
||||
$VersionFileUrl = "$AzureFeed/$AzureChannel/dnvm/latest.sharedfx.win.$CLIArchitecture.version"
|
||||
$VersionFileUrl = "$UncachedFeed/$AzureChannel/dnvm/latest.sharedfx.win.$CLIArchitecture.version"
|
||||
}
|
||||
else {
|
||||
$VersionFileUrl = "$AzureFeed/Sdk/$AzureChannel/latest.version"
|
||||
$VersionFileUrl = "$UncachedFeed/Sdk/$AzureChannel/latest.version"
|
||||
}
|
||||
|
||||
try {
|
||||
|
|
7
scripts/obtain/dotnet-install.sh
vendored
7
scripts/obtain/dotnet-install.sh
vendored
|
@ -286,9 +286,9 @@ get_latest_version_info() {
|
|||
|
||||
local version_file_url=null
|
||||
if [ "$shared_runtime" = true ]; then
|
||||
version_file_url="$azure_feed/$azure_channel/dnvm/latest.sharedfx.$osname.$normalized_architecture.version"
|
||||
version_file_url="$uncached_feed/$azure_channel/dnvm/latest.sharedfx.$osname.$normalized_architecture.version"
|
||||
else
|
||||
version_file_url="$azure_feed/Sdk/$azure_channel/latest.version"
|
||||
version_file_url="$uncached_feed/Sdk/$azure_channel/latest.version"
|
||||
fi
|
||||
say_verbose "get_latest_version_info: latest url: $version_file_url"
|
||||
|
||||
|
@ -556,7 +556,8 @@ architecture="<auto>"
|
|||
debug_symbols=false
|
||||
dry_run=false
|
||||
no_path=false
|
||||
azure_feed="https://dotnetcli.blob.core.windows.net/dotnet"
|
||||
azure_feed="https://dotnetcli.azureedge.net/dotnet"
|
||||
uncached_feed="https://dotnetcli.blob.core.windows.net/dotnet"
|
||||
verbose=false
|
||||
shared_runtime=false
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue