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

[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot] 2021-11-24 14:15:59 +00:00 committed by GitHub
parent fbc5bbe6ea
commit 22c7274ec7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 11 additions and 45 deletions

View file

@ -172,19 +172,19 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <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> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha> <Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21569.2"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha> <Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21569.2"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="7.0.0-beta.21573.3">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>97463777ee9a8445d4a4c5911ede0f0cd71fa8aa</Sha> <Sha>927f8d4d5036f68a5fc6d042f336bc9458027208</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-alpha.1.21521.1"> <Dependency Name="Microsoft.SourceBuild.Intermediate.source-build-reference-packages" Version="6.0.0-alpha.1.21521.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

View file

@ -20,7 +20,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21569.2</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>7.0.0-beta.21573.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->

View file

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

View file

@ -112,7 +112,7 @@ if [[ -z "$CC" ]]; then
fi fi
if [[ "$compiler" == "clang" ]]; then 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 # Only lld version >= 9 can be considered stable
if [[ "$majorVersion" -ge 9 ]]; then if [[ "$majorVersion" -ge 9 ]]; then
LDFLAGS="-fuse-ld=lld" LDFLAGS="-fuse-ld=lld"

View file

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

View file

@ -114,6 +114,7 @@ jobs:
continueOnError: ${{ parameters.continueOnError }} continueOnError: ${{ parameters.continueOnError }}
condition: and(succeeded(), in(variables['_SignType'], 'real', 'test'), eq(variables['Agent.Os'], 'Windows_NT')) 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 - task: NuGetAuthenticate@0
- ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}: - ${{ if or(eq(parameters.artifacts.download, 'true'), ne(parameters.artifacts.download, '')) }}:

View file

@ -163,9 +163,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
# Disable telemetry on CI. # Disable telemetry on CI.
if ($ci) { if ($ci) {
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1 $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 # 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. # If $ci flag is set, turn on (and log that we did) special environment variables for improved Nuget client retry logic.
# #

View file

@ -405,13 +405,6 @@ function StopProcesses {
return 0 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 { function MSBuild {
local args=$@ local args=$@
if [[ "$pipelines_log" == true ]]; then if [[ "$pipelines_log" == true ]]; then

View file

@ -11,7 +11,7 @@
"cmake": "3.16.4" "cmake": "3.16.4"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21569.2", "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21573.3",
"Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21569.2" "Microsoft.DotNet.CMake.Sdk": "7.0.0-beta.21573.3"
} }
} }