Skip to content

Commit 2c4ed90

Browse files
dotnet-maestro[bot]baronfel
authored andcommitted
Update dependencies from https://github.com/dotnet/arcade build 20190912.5 (#7555)
- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19462.5
1 parent 1bea321 commit 2c4ed90

File tree

5 files changed

+39
-7
lines changed

5 files changed

+39
-7
lines changed

eng/Version.Details.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
<ProductDependencies>
44
</ProductDependencies>
55
<ToolsetDependencies>
6-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19461.7">
6+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19462.5">
77
<Uri>https://github.com/dotnet/arcade</Uri>
8-
<Sha>8eb29ba860a3cfcfe68f9a8256caa7efc1f1aaba</Sha>
8+
<Sha>6003ee189f456c92a18b097f226d4927309def27</Sha>
99
</Dependency>
1010
</ToolsetDependencies>
1111
</Dependencies>

eng/common/templates/post-build/channels/netcore-internal-30.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ stages:
107107
/p:Configuration=Release
108108
/p:PublishInstallersAndChecksums=true
109109
/p:ChecksumsTargetStaticFeed=$(InternalChecksumsBlobFeedUrl)
110-
/p:ChecksumsTargetStaticFeedKey=$(InternalChecksumsBlobFeedKey)
110+
/p:ChecksumsAzureAccountKey=$(InternalChecksumsBlobFeedKey)
111111
/p:InstallersTargetStaticFeed=$(InternalInstallersBlobFeedUrl)
112-
/p:InstallersTargetStaticFeedKey=$(InternalInstallersBlobFeedKey)
112+
/p:InstallersAzureAccountKey=$(InternalInstallersBlobFeedKey)
113113
/p:PublishToAzureDevOpsNuGetFeeds=true
114114
/p:AzureDevOpsStaticShippingFeed='https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v3/index.json'
115115
/p:AzureDevOpsStaticShippingFeedKey='$(dn-bot-dnceng-artifact-feeds-rw)'
@@ -121,4 +121,4 @@ stages:
121121

122122
- template: ../../steps/promote-build.yml
123123
parameters:
124-
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}
124+
ChannelId: ${{ variables.InternalServicing_30_Channel_Id }}

eng/common/tools.ps1

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,16 @@ function InitializeDotNetCli([bool]$install) {
153153

154154
# Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build
155155
Write-PipelinePrependPath -Path $dotnetRoot
156+
157+
# Work around issues with Azure Artifacts credential provider
158+
# https://github.com/dotnet/arcade/issues/3932
159+
if ($ci) {
160+
$env:NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS = 20
161+
$env:NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS = 20
162+
Write-PipelineSetVariable -Name 'NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS' -Value '20'
163+
Write-PipelineSetVariable -Name 'NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS' -Value '20'
164+
}
165+
156166
Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0'
157167
Write-PipelineSetVariable -Name 'DOTNET_SKIP_FIRST_TIME_EXPERIENCE' -Value '1'
158168

@@ -365,7 +375,6 @@ function InitializeBuildTool() {
365375
Write-PipelineTelemetryError -Category "InitializeToolset" -Message "/global.json must specify 'tools.dotnet'."
366376
ExitWithExitCode 1
367377
}
368-
369378
$buildTool = @{ Path = Join-Path $dotnetRoot "dotnet.exe"; Command = "msbuild"; Tool = "dotnet"; Framework = "netcoreapp2.1" }
370379
} elseif ($msbuildEngine -eq "vs") {
371380
try {
@@ -490,6 +499,13 @@ function Stop-Processes() {
490499
function MSBuild() {
491500
if ($pipelinesLog) {
492501
$buildTool = InitializeBuildTool
502+
503+
# Work around issues with Azure Artifacts credential provider
504+
# https://github.com/dotnet/arcade/issues/3932
505+
if ($ci -and $buildTool.Tool -eq "dotnet") {
506+
dotnet nuget locals http-cache -c
507+
}
508+
493509
$toolsetBuildProject = InitializeToolset
494510
$path = Split-Path -parent $toolsetBuildProject
495511
$path = Join-Path $path (Join-Path $buildTool.Framework "Microsoft.DotNet.Arcade.Sdk.dll")

eng/common/tools.sh

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,15 @@ function InitializeDotNetCli {
152152
# build steps from using anything other than what we've downloaded.
153153
Write-PipelinePrependPath -path "$dotnet_root"
154154

155+
# Work around issues with Azure Artifacts credential provider
156+
# https://github.com/dotnet/arcade/issues/3932
157+
if [[ "$ci" == true ]]; then
158+
export NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS=20
159+
export NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS=20
160+
Write-PipelineSetVariable -name "NUGET_PLUGIN_HANDSHAKE_TIMEOUT_IN_SECONDS" -value "20"
161+
Write-PipelineSetVariable -name "NUGET_PLUGIN_REQUEST_TIMEOUT_IN_SECONDS" -value "20"
162+
fi
163+
155164
Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0"
156165
Write-PipelineSetVariable -name "DOTNET_SKIP_FIRST_TIME_EXPERIENCE" -value "1"
157166

@@ -328,6 +337,13 @@ function MSBuild {
328337
if [[ "$pipelines_log" == true ]]; then
329338
InitializeBuildTool
330339
InitializeToolset
340+
341+
# Work around issues with Azure Artifacts credential provider
342+
# https://github.com/dotnet/arcade/issues/3932
343+
if [[ "$ci" == true ]]; then
344+
dotnet nuget locals http-cache -c
345+
fi
346+
331347
local toolset_dir="${_InitializeToolset%/*}"
332348
local logger_path="$toolset_dir/$_InitializeBuildToolFramework/Microsoft.DotNet.Arcade.Sdk.dll"
333349
args=( "${args[@]}" "-logger:$logger_path" )

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
}
1111
},
1212
"msbuild-sdks": {
13-
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19461.7",
13+
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19462.5",
1414
"Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.19069.2"
1515
}
1616
}

0 commit comments

Comments
 (0)