Browse Source

Update dependencies from https://github.com/dotnet/arcade build 20211123.3 (#1226)

[main] Update dependencies from dotnet/arcade
sebros/macos
dotnet-maestro[bot] 5 years ago
committed by GitHub
parent
commit
c807c0563c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 20
      eng/Version.Details.xml
  2. 4
      eng/common/build.sh
  3. 2
      eng/common/native/init-compiler.sh
  4. 3
      eng/common/sdk-task.ps1
  5. 1
      eng/common/templates/job/job.yml
  6. 21
      eng/common/tools.ps1
  7. 7
      eng/common/tools.sh
  8. 2
      global.json

20
eng/Version.Details.xml

@ -3,25 +3,25 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.SignTool" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.21569.2">
<Dependency Name="Microsoft.DotNet.SwaggerGenerator.MSBuild" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha>
<Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Maestro.Client" Version="1.1.0-beta.19556.4">
<Uri>https://github.com/dotnet/arcade-services</Uri>

4
eng/common/build.sh

@ -187,10 +187,6 @@ function InitializeCustomToolset {
}
function Build {
if [[ "$ci" == true ]]; then
TryLogClientIpAddress
fi
InitializeToolset
InitializeCustomToolset

2
eng/common/native/init-compiler.sh

@ -112,7 +112,7 @@ if [[ -z "$CC" ]]; then
fi
if [[ "$compiler" == "clang" ]]; then
if command -v "lld$desired_version" > /dev/null; then
if "$CC" -fuse-ld=lld -Wl,--version 2>&1; then
# Only lld version >= 9 can be considered stable
if [[ "$majorVersion" -ge 9 ]]; then
LDFLAGS="-fuse-ld=lld"

3
eng/common/sdk-task.ps1

@ -83,9 +83,6 @@ try {
}
if ($restore) {
if ($ci) {
Try-LogClientIpAddress
}
Build 'Restore'
}

1
eng/common/templates/job/job.yml

@ -114,6 +114,7 @@ jobs:
continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT'))
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:
- task: NuGetAuthenticate@0
- ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}:

21
eng/common/tools.ps1

@ -163,9 +163,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
# Disable telemetry on CI.
if ($ci) {
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
# In case of network error, try to log the current IP for reference
Try-LogClientIpAddress
}
# Source Build uses DotNetCoreSdkDir variable
@ -895,24 +892,6 @@ if (!$disableConfigureToolsetImport) {
}
}
function Try-LogClientIpAddress()
{
Write-Host "Attempting to log this client's IP for Azure Package feed telemetry purposes"
try
{
$result = Invoke-WebRequest -Uri "http://co1r5a.msedge.net/fdv2/diagnostics.aspx" -UseBasicParsing
$lines = $result.Content.Split([Environment]::NewLine)
$socketIp = $lines | Select-String -Pattern "^Socket IP:.*"
Write-Host $socketIp
$clientIp = $lines | Select-String -Pattern "^Client IP:.*"
Write-Host $clientIp
}
catch
{
Write-Host "Unable to get this machine's effective IP address for logging: $_"
}
}
#
# If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic.
#

7
eng/common/tools.sh

@ -405,13 +405,6 @@ function StopProcesses {
return 0
}
function TryLogClientIpAddress () {
echo 'Attempting to log this client''s IP for Azure Package feed telemetry purposes'
if command -v curl > /dev/null; then
curl -s 'http://co1r5a.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true
fi
}
function MSBuild {
local args=$@
if [[ "$pipelines_log" == true ]]; then

2
global.json

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

Loading…
Cancel
Save