Update dependencies from https://github.com/dotnet/arcade build 20201117.7 (#3000)

[master] Update dependencies from dotnet/arcade

eng/Version.Details.xml

@@ -3,17 +3,17 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20566.3">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20567.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf</Sha>
+      <Sha>a9a80fb35d2e7da21509441d665a40022ce8f1b4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20566.3">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.20567.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf</Sha>
+      <Sha>a9a80fb35d2e7da21509441d665a40022ce8f1b4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20566.3">
+    <Dependency Name="Microsoft.DotNet.GenAPI" Version="6.0.0-beta.20567.7">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>7a2f81b46ec807fe5df62f6df9c26bd3daee4fcf</Sha>
+      <Sha>a9a80fb35d2e7da21509441d665a40022ce8f1b4</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -18,6 +18,6 @@
     <SnVersion>1.0.0</SnVersion>
     <VSWhereVersion>2.5.2</VSWhereVersion>
     <MicroBuildCoreVersion>0.2.0</MicroBuildCoreVersion>
-    <MicrosoftDotNetGenAPIVersion>6.0.0-beta.20566.3</MicrosoftDotNetGenAPIVersion>
+    <MicrosoftDotNetGenAPIVersion>6.0.0-beta.20567.7</MicrosoftDotNetGenAPIVersion>
   </PropertyGroup>
 </Project>

eng/common/SetupNugetSources.ps1

@@ -99,8 +99,9 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Passw
 function EnablePrivatePackageSources($DisabledPackageSources) {
     $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]")
     ForEach ($DisabledPackageSource in $maestroPrivateSources) {
-        Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled"
-        $DisabledPackageSource.SetAttribute("value", "false")
+        Write-Host "`tEnsuring private source '$($DisabledPackageSource.key)' is enabled by deleting it from disabledPackageSource"
+        # Due to https://github.com/NuGet/Home/issues/10291, we must actually remove the disabled entries
+        $DisabledPackageSources.RemoveChild($DisabledPackageSource)
     }
 }
 

eng/common/SetupNugetSources.sh

@@ -158,8 +158,8 @@ if [ "$?" == "0" ]; then
     for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do
         if [[ $DisabledSourceName == darc-int* ]]
             then
-                OldDisableValue="add key=\"$DisabledSourceName\" value=\"true\""
-                NewDisableValue="add key=\"$DisabledSourceName\" value=\"false\""
+                OldDisableValue="<add key=\"$DisabledSourceName\" value=\"true\" />"
+                NewDisableValue="<!-- Reenabled for build : $DisabledSourceName -->"
                 sed -i.bak "s|$OldDisableValue|$NewDisableValue|" $ConfigFile
                 echo "Neutralized disablePackageSources entry for '$DisabledSourceName'"
         fi

global.json

@@ -9,7 +9,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20566.3",
-    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20566.3"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.20567.7",
+    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.20567.7"
   }
 }