Browse Source

Update dependencies from https://github.com/dotnet/arcade build 20211116.10 (#1219)

[main] Update dependencies from dotnet/arcade
sebros/macos
dotnet-maestro[bot] 5 years ago
committed by GitHub
parent
commit
b0f98790fa
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      NuGet.config
  2. 20
      eng/Version.Details.xml
  3. 2
      eng/Versions.props
  4. 2
      eng/common/sdl/execute-all-sdl-tools.ps1
  5. 57
      eng/common/tools.ps1
  6. 62
      eng/common/tools.sh
  7. 2
      global.json

2
NuGet.config

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<configuration> <configuration>
<packageSources> <packageSources>
<clear /> <clear />

20
eng/Version.Details.xml

@ -3,25 +3,25 @@
<ProductDependencies> <ProductDependencies>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21559.3"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21566.10">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha> <Sha>53cc1bc2e555aa7aea95884575d22e21d63708cf</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.21559.3"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.21566.10">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha> <Sha>53cc1bc2e555aa7aea95884575d22e21d63708cf</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.21559.3"> <Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.21566.10">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha> <Sha>53cc1bc2e555aa7aea95884575d22e21d63708cf</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21559.3"> <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21566.10">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha> <Sha>53cc1bc2e555aa7aea95884575d22e21d63708cf</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.21559.3"> <Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.21566.10">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fecf65bedcee9036b8ba9d8d7feef5413f294914</Sha> <Sha>53cc1bc2e555aa7aea95884575d22e21d63708cf</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4"> <Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>

2
eng/Versions.props

@ -9,4 +9,4 @@
<UsingToolNetFrameworkReferenceAssemblies Condition="'$(DotNetBuildFromSource)' != 'true'">true</UsingToolNetFrameworkReferenceAssemblies> <UsingToolNetFrameworkReferenceAssemblies Condition="'$(DotNetBuildFromSource)' != 'true'">true</UsingToolNetFrameworkReferenceAssemblies>
<!-- Libs --> <!-- Libs -->
</PropertyGroup> </PropertyGroup>
</Project> </Project>

2
eng/common/sdl/execute-all-sdl-tools.ps1

@ -124,7 +124,7 @@ try {
Exec-BlockVerbosely { Exec-BlockVerbosely {
& $(Join-Path $PSScriptRoot 'run-sdl.ps1') ` & $(Join-Path $PSScriptRoot 'run-sdl.ps1') `
-GuardianCliLocation $guardianCliLocation ` -GuardianCliLocation $guardianCliLocation `
-WorkingDirectory $workingDirectory ` -WorkingDirectory $SourceDirectory `
-UpdateBaseline $UpdateBaseline ` -UpdateBaseline $UpdateBaseline `
-GdnFolder $gdnFolder -GdnFolder $gdnFolder
} }

57
eng/common/tools.ps1

@ -301,31 +301,44 @@ function InstallDotNet([string] $dotnetRoot,
if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles }
if ($noPath) { $installParameters.NoPath = $True } if ($noPath) { $installParameters.NoPath = $True }
try { $variations = @()
& $installScript @installParameters $variations += @($installParameters)
}
catch {
if ($runtimeSourceFeed -or $runtimeSourceFeedKey) {
Write-Host "Failed to install dotnet from public location. Trying from '$runtimeSourceFeed'"
if ($runtimeSourceFeed) { $installParameters.AzureFeed = $runtimeSourceFeed }
if ($runtimeSourceFeedKey) { $dotnetBuilds = $installParameters.Clone()
$decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey) $dotnetbuilds.AzureFeed = "https://dotnetbuilds.azureedge.net/public"
$decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes) $variations += @($dotnetBuilds)
$installParameters.FeedCredential = $decodedString
}
try { if ($runtimeSourceFeed) {
& $installScript @installParameters $runtimeSource = $installParameters.Clone()
} $runtimeSource.AzureFeed = $runtimeSourceFeed
catch { if ($runtimeSourceFeedKey) {
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from custom location '$runtimeSourceFeed'." $decodedBytes = [System.Convert]::FromBase64String($runtimeSourceFeedKey)
ExitWithExitCode 1 $decodedString = [System.Text.Encoding]::UTF8.GetString($decodedBytes)
} $runtimeSource.FeedCredential = $decodedString
}
$variations += @($runtimeSource)
}
$installSuccess = $false
foreach ($variation in $variations) {
if ($variation | Get-Member AzureFeed) {
$location = $variation.AzureFeed
} else { } else {
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from public location." $location = "public location";
ExitWithExitCode 1 }
Write-Host "Attempting to install dotnet from $location."
try {
& $installScript @variation
$installSuccess = $true
break
} }
catch {
Write-Host "Failed to install dotnet from $location."
}
}
if (-not $installSuccess) {
Write-PipelineTelemetryError -Category 'InitializeToolset' -Message "Failed to install dotnet from any of the specified locations."
ExitWithExitCode 1
} }
} }
@ -887,7 +900,7 @@ function Try-LogClientIpAddress()
Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes" Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes"
try try
{ {
$result = Invoke-WebRequest -Uri "http://co1.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing $result = Invoke-WebRequest -Uri "http://co1r5a.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing
$lines = $result.Content.Split([Environment]::NewLine) $lines = $result.Content.Split([Environment]::NewLine)
$socketIp = $lines | Select-String -Pattern "^Socket IP:.*" $socketIp = $lines | Select-String -Pattern "^Socket IP:.*"
Write-Host $socketIp Write-Host $socketIp

62
eng/common/tools.sh

@ -188,28 +188,29 @@ function InstallDotNet {
GetDotNetInstallScript "$root" GetDotNetInstallScript "$root"
local install_script=$_GetDotNetInstallScript local install_script=$_GetDotNetInstallScript
local archArg='' local installParameters=(--version $version --install-dir "$root")
if [[ -n "${3:-}" ]] && [ "$3" != 'unset' ]; then if [[ -n "${3:-}" ]] && [ "$3" != 'unset' ]; then
archArg="--architecture $3" installParameters+=(--architecture $3)
fi fi
local runtimeArg=''
if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then if [[ -n "${4:-}" ]] && [ "$4" != 'sdk' ]; then
runtimeArg="--runtime $4" installParameters+=(--runtime $4)
fi fi
local skipNonVersionedFilesArg=""
if [[ "$#" -ge "5" ]] && [[ "$5" != 'false' ]]; then if [[ "$#" -ge "5" ]] && [[ "$5" != 'false' ]]; then
skipNonVersionedFilesArg="--skip-non-versioned-files" installParameters+=(--skip-non-versioned-files)
fi fi
bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg || {
local exit_code=$?
echo "Failed to install dotnet SDK from public location (exit code '$exit_code')."
local runtimeSourceFeed='' local variations=() # list of variable names with parameter arrays in them
if [[ -n "${6:-}" ]]; then
runtimeSourceFeed="--azure-feed $6" local public_location=("${installParameters[@]}")
fi variations+=(public_location)
local dotnetbuilds=("${installParameters[@]}" --azure-feed "https://dotnetbuilds.azureedge.net/public")
variations+=(dotnetbuilds)
local runtimeSourceFeedKey='' if [[ -n "${6:-}" ]]; then
variations+=(private_feed)
local private_feed=("${installParameters[@]}" --azure-feed $6)
if [[ -n "${7:-}" ]]; then if [[ -n "${7:-}" ]]; then
# The 'base64' binary on alpine uses '-d' and doesn't support '--decode' # The 'base64' binary on alpine uses '-d' and doesn't support '--decode'
# '-d'. To work around this, do a simple detection and switch the parameter # '-d'. To work around this, do a simple detection and switch the parameter
@ -219,22 +220,27 @@ function InstallDotNet {
decodeArg="-d" decodeArg="-d"
fi fi
decodedFeedKey=`echo $7 | base64 $decodeArg` decodedFeedKey=`echo $7 | base64 $decodeArg`
runtimeSourceFeedKey="--feed-credential $decodedFeedKey" private_feed+=(--feed-credential $decodedFeedKey)
fi fi
fi
if [[ -n "$runtimeSourceFeed" || -n "$runtimeSourceFeedKey" ]]; then local installSuccess=0
bash "$install_script" --version $version --install-dir "$root" $archArg $runtimeArg $skipNonVersionedFilesArg $runtimeSourceFeed $runtimeSourceFeedKey || { for variationName in "${variations[@]}"; do
local exit_code=$? local name="$variationName[@]"
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from custom location '$runtimeSourceFeed' (exit code '$exit_code')." local variation=("${!name}")
ExitWithExitCode $exit_code echo "Attempting to install dotnet from $variationName."
} bash "$install_script" "${variation[@]}" && installSuccess=1
else if [[ "$installSuccess" -eq 1 ]]; then
if [[ $exit_code != 0 ]]; then break
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from public location (exit code '$exit_code')."
fi
ExitWithExitCode $exit_code
fi fi
}
echo "Failed to install dotnet from $variationName."
done
if [[ "$installSuccess" -eq 0 ]]; then
Write-PipelineTelemetryError -category 'InitializeToolset' "Failed to install dotnet SDK from any of the specified locations."
ExitWithExitCode 1
fi
} }
function with_retries { function with_retries {
@ -402,7 +408,7 @@ function StopProcesses {
function TryLogClientIpAddress () { function TryLogClientIpAddress () {
echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes' echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
if command -v curl > /dev/null; then if command -v curl > /dev/null; then
curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true curl -s 'http://co1r5a.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true
fi fi
} }

2
global.json

@ -14,6 +14,6 @@
} }
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21559.3" "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21566.10"
} }
} }

Loading…
Cancel
Save