From e9a385dba2b465f4e9bf409fd85b12e3d7b3179b Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 10 Feb 2021 03:35:35 +0000
Subject: [PATCH] Update dependencies from https://github.com/dotnet/arcade
 build 20210209.6 (#30058)

[release/5.0] Update dependencies from dotnet/arcade
---
 NuGet.config                             |  4 ++++
 eng/Version.Details.xml                  | 12 ++++++------
 eng/Versions.props                       |  2 +-
 eng/common/sdl/init-sdl.ps1              | 13 +------------
 eng/common/sdl/packages.config           |  2 +-
 eng/common/templates/job/execute-sdl.yml |  2 +-
 global.json                              |  4 ++--
 7 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/NuGet.config b/NuGet.config
index 3745056e38..fcc44044bc 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -19,6 +19,7 @@
     <add key="dotnet31-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet3.1-transport/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
+    <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <add key="darc-int-dotnet-efcore-1ee6b62" value="true" />
     <add key="darc-int-dotnet-runtime-cb5f173" value="true" />
     <add key="darc-int-dotnet-efcore-8c89ec4" value="true" />
@@ -35,10 +36,13 @@
     <add key="darc-int-dotnet-runtime-fe8a2d0" value="true" />
     <add key="darc-int-dotnet-runtime-eae88cc" value="true" />
     <!--  Begin: Package sources from dotnet-runtime -->
+    <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
+    <add key="darc-int-dotnet-runtime-c636bbd" value="true" />
     <add key="darc-int-dotnet-runtime-c636bbd" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-efcore -->
     <add key="darc-int-dotnet-efcore-efc2924" value="true" />
+    <add key="darc-int-dotnet-efcore-efc2924" value="true" />
     <!--  End: Package sources from dotnet-efcore -->
   </disabledPackageSources>
 </configuration>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 81118f21b4..d4cc31740f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -313,17 +313,17 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>c636bbdc8a2d393d07c0e9407a4f8923ba1a21cb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21063.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.21109.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f73f462f75b5fa21805f0b3c477b11277c5da556</Sha>
+      <Sha>86a9457118ee57d6979ec787a82d14ea34eb71cc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21063.3">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.21109.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f73f462f75b5fa21805f0b3c477b11277c5da556</Sha>
+      <Sha>86a9457118ee57d6979ec787a82d14ea34eb71cc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21063.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="5.0.0-beta.21109.6">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>f73f462f75b5fa21805f0b3c477b11277c5da556</Sha>
+      <Sha>86a9457118ee57d6979ec787a82d14ea34eb71cc</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/Versions.props b/eng/Versions.props
index b104e692f0..0c792bc581 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -135,7 +135,7 @@
     <MicrosoftEntityFrameworkCorePackageVersion>5.0.3</MicrosoftEntityFrameworkCorePackageVersion>
     <MicrosoftEntityFrameworkCoreDesignPackageVersion>5.0.3</MicrosoftEntityFrameworkCoreDesignPackageVersion>
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21063.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
+    <MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.21109.6</MicrosoftDotNetBuildTasksInstallersPackageVersion>
   </PropertyGroup>
   <!--
 
diff --git a/eng/common/sdl/init-sdl.ps1 b/eng/common/sdl/init-sdl.ps1
index a68bf0b88e..bb6a429711 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/eng/common/sdl/packages.config b/eng/common/sdl/packages.config
index 968b39bef5..3bd8b29ebd 100644
--- a/eng/common/sdl/packages.config
+++ b/eng/common/sdl/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Guardian.Cli.win10-x64" version="0.20.1"/>
+  <package id="Microsoft.Guardian.Cli" version="0.53.3"/>
 </packages>
diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml
index c64c4f5686..53c100222b 100644
--- a/eng/common/templates/job/execute-sdl.yml
+++ b/eng/common/templates/job/execute-sdl.yml
@@ -83,7 +83,7 @@ jobs:
       continueOnError: ${{ parameters.sdlContinueOnError }}
   - ${{ if eq(parameters.overrideParameters, '') }}:
     - powershell: eng/common/sdl/execute-all-sdl-tools.ps1
-        -GuardianPackageName Microsoft.Guardian.Cli.win10-x64.0.20.1
+        -GuardianPackageName Microsoft.Guardian.Cli.0.53.3
         -NugetPackageDirectory $(Build.SourcesDirectory)\.packages
         -AzureDevOpsAccessToken $(dn-bot-dotnet-build-rw-code-rw)
         ${{ parameters.additionalParameters }}
diff --git a/global.json b/global.json
index 35abd2e76c..f4bc8a6ef6 100644
--- a/global.json
+++ b/global.json
@@ -30,7 +30,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.15.2",
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21063.3",
-    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21063.3"
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.21109.6",
+    "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.21109.6"
   }
 }