From 2eb6e257ea84c24cbf8d4a3aa574f73a5bc49cec Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" Date: Sat, 30 Jan 2021 13:01:53 +0000 Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade build 20210128.12 Microsoft.DotNet.CodeAnalysis , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.ApiCompat , Microsoft.DotNet.GenAPI , Microsoft.DotNet.Helix.Sdk From Version 6.0.0-beta.21076.1 -> To Version 6.0.0-beta.21078.12 --- eng/Version.Details.xml | 20 ++++++++++---------- eng/Versions.props | 6 +++--- eng/common/sdl/init-sdl.ps1 | 13 +------------ global.json | 4 ++-- 4 files changed, 16 insertions(+), 27 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index fc53a1733b3..c5f5a23180b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -99,25 +99,25 @@ - + https://github.com/dotnet/arcade - d7da80d96daf724706aafa450e00222fe659af13 + 3233c41c837f72827efd8f827b538e047334847d - + https://github.com/dotnet/arcade - d7da80d96daf724706aafa450e00222fe659af13 + 3233c41c837f72827efd8f827b538e047334847d - + https://github.com/dotnet/arcade - d7da80d96daf724706aafa450e00222fe659af13 + 3233c41c837f72827efd8f827b538e047334847d - + https://github.com/dotnet/arcade - d7da80d96daf724706aafa450e00222fe659af13 + 3233c41c837f72827efd8f827b538e047334847d - + https://github.com/dotnet/arcade - d7da80d96daf724706aafa450e00222fe659af13 + 3233c41c837f72827efd8f827b538e047334847d diff --git a/eng/Versions.props b/eng/Versions.props index 21cc585b02a..d2799e35cf3 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,9 +43,9 @@ - 6.0.0-beta.21076.1 - 6.0.0-beta.21076.1 - 6.0.0-beta.21076.1 + 6.0.0-beta.21078.12 + 6.0.0-beta.21078.12 + 6.0.0-beta.21078.12 diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1 index a68bf0b88ea..bb6a4297110 100644 --- a/eng/common/sdl/init-sdl.ps1 +++ b/eng/common/sdl/init-sdl.ps1 @@ -29,18 +29,7 @@ $zipFile = "$WorkingDirectory/gdn.zip" Add-Type -AssemblyName System.IO.Compression.FileSystem $gdnFolder = (Join-Path $WorkingDirectory '.gdn') -try { - # We try to download the zip; if the request fails (e.g. the file doesn't exist), we catch it and init guardian instead - Write-Host 'Downloading gdn folder from internal config repostiory...' - Invoke-WebRequest -Headers @{ "Accept"="application/zip"; "Authorization"="Basic $encodedPat" } -Uri $uri -OutFile $zipFile - if (Test-Path $gdnFolder) { - # Remove the gdn folder if it exists (it shouldn't unless there's too much caching; this is just in case) - Remove-Item -Force -Recurse $gdnFolder - } - [System.IO.Compression.ZipFile]::ExtractToDirectory($zipFile, $WorkingDirectory) - Write-Host $gdnFolder - ExitWithExitCode 0 -} catch [System.Net.WebException] { } # Catch and ignore webexception + try { # if the folder does not exist, we'll do a guardian init and push it to the remote repository Write-Host 'Initializing Guardian...' diff --git a/global.json b/global.json index d3659bd371d..7e385d57d03 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21076.1", - "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21076.1" + "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.21078.12", + "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.21078.12" }, "sdk": { "version": "5.0.100"