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

Update dependencies from https://github.com/dotnet/arcade build 20210824.3 (#11680)

Browse source 
[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot] 2021-08-25 13:13:52 +00:00 committed by GitHub
parent 3148ebb77c
commit fd550a3dac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
eng/Version.Details.xml
View file

@ -157,19 +157,19 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21420.4"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.21424.3">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fe787bd48ed72e51a98eb5e4e5e5af74edb531e5</Sha> <Sha>3dd12f0a1d25fa29b84e38b7d2345a693f4ae45e</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.21420.4"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="6.0.0-beta.21424.3">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fe787bd48ed72e51a98eb5e4e5e5af74edb531e5</Sha> <Sha>3dd12f0a1d25fa29b84e38b7d2345a693f4ae45e</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21420.4"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.21424.3">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>fe787bd48ed72e51a98eb5e4e5e5af74edb531e5</Sha> <Sha>3dd12f0a1d25fa29b84e38b7d2345a693f4ae45e</Sha>
</Dependency> </Dependency>
<Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1"> <Dependency Name="Private.SourceBuild.ReferencePackages" Version="1.0.0-beta.20217.1">
<Uri>https://github.com/dotnet/source-build-reference-packages</Uri> <Uri>https://github.com/dotnet/source-build-reference-packages</Uri>

2
eng/Versions.props
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>6.0.0-beta.21420.4</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>6.0.0-beta.21424.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/winforms --> <!-- Dependency from https://github.com/dotnet/winforms -->

3
eng/common/build.sh
View file

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

2
eng/common/sdk-task.ps1
View file

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

6
eng/common/tools.ps1
View file

@ -154,9 +154,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) {
return $global:_DotNetInstallDir return $global:_DotNetInstallDir
} }
# In case of network error, try to log the current IP for reference
Try-LogClientIpAddress
# Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism
$env:DOTNET_MULTILEVEL_LOOKUP=0 $env:DOTNET_MULTILEVEL_LOOKUP=0
@ -166,6 +163,9 @@ 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

2
eng/common/tools.sh
View file

@ -402,7 +402,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: ' curl -s 'http://co1.msedge.net/fdv2/diagnostics.aspx' | grep ' IP: ' || true
fi fi
} }

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "3.16.4" "cmake": "3.16.4"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21420.4", "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21424.3",
"Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21420.4" "Microsoft.DotNet.CMake.Sdk": "6.0.0-beta.21424.3"
} }
} }