[master] Update dependencies from dotnet/arcade (dotnet#233)

* Update dependencies from https://github.com/dotnet/arcade build 20200819.21 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20419.21 * Update dependencies from https://github.com/dotnet/arcade build 20200824.23 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20424.23 * Update dependencies from https://github.com/dotnet/arcade build 20200826.1 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20426.1 * Update dependencies from https://github.com/dotnet/arcade build 20200826.6 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20426.6 * Update dependencies from https://github.com/dotnet/arcade build 20200827.5 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20427.5 * Update dependencies from https://github.com/dotnet/arcade build 20200831.1 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20431.1 * Update dependencies from https://github.com/dotnet/arcade build 20200831.4 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20431.4 * Update dependencies from https://github.com/dotnet/arcade build 20200901.5 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20451.5 * Update dependencies from https://github.com/dotnet/arcade build 20200902.19 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20452.19 * Update dependencies from https://github.com/dotnet/arcade build 20200903.7 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20453.7 * Update dependencies from https://github.com/dotnet/arcade build 20200909.8 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20459.8 * Update dependencies from https://github.com/dotnet/arcade build 20200911.7 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20461.7 * Update dependencies from https://github.com/dotnet/arcade build 20200914.13 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20464.13 * Update dependencies from https://github.com/dotnet/arcade build 20200915.7 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20465.7 * Update dependencies from https://github.com/dotnet/arcade build 20200917.6 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20467.6 * Update dependencies from https://github.com/dotnet/arcade build 20200921.1 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20471.1 * Update dependencies from https://github.com/dotnet/arcade build 20200922.36 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20472.36 * Update dependencies from https://github.com/dotnet/arcade build 20200924.4 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20474.4 * Update dependencies from https://github.com/dotnet/arcade build 20200928.3 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20478.3 * Update dependencies from https://github.com/dotnet/arcade build 20201006.7 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 5.0.0-beta.20506.7 * Update dependencies from https://github.com/dotnet/arcade build 20201009.12 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20509.12 * Update dependencies from https://github.com/dotnet/arcade build 20201014.1 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20514.1 * Update dependencies from https://github.com/dotnet/arcade build 20201015.7 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20515.7 * Update dependencies from https://github.com/dotnet/arcade build 20201016.5 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20516.5 * Update dependencies from https://github.com/dotnet/arcade build 20201020.8 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20520.8 * Update dependencies from https://github.com/dotnet/arcade build 20201022.2 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20522.2 * Update dependencies from https://github.com/dotnet/arcade build 20201025.1 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20525.1 * Update dependencies from https://github.com/dotnet/arcade build 20201026.10 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20526.10 * Update dependencies from https://github.com/dotnet/arcade build 20201027.10 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20527.10 * Update dependencies from https://github.com/dotnet/arcade build 20201029.1 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20529.1 * Update dependencies from https://github.com/dotnet/arcade build 20201030.2 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20530.2 * Update dependencies from https://github.com/dotnet/arcade build 20201102.5 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20552.5 * Update dependencies from https://github.com/dotnet/arcade build 20201111.5 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20561.5 * Update dependencies from https://github.com/dotnet/arcade build 20201113.2 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20563.2 * Update dependencies from https://github.com/dotnet/arcade build 20201116.3 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20566.3 * Update dependencies from https://github.com/dotnet/arcade build 20201117.7 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20567.7 * Update dependencies from https://github.com/dotnet/arcade build 20201123.2 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20573.2 * Update dependencies from https://github.com/dotnet/arcade build 20201201.2 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20601.2 * Update dependencies from https://github.com/dotnet/arcade build 20201204.2 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20604.2 * Update dependencies from https://github.com/dotnet/arcade build 20201207.11 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20607.11 * Update dependencies from https://github.com/dotnet/arcade build 20201208.21 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20608.21 * Update dependencies from https://github.com/dotnet/arcade build 20201209.9 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20609.9 * Update dependencies from https://github.com/dotnet/arcade build 20201210.4 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20610.4 * Update dependencies from https://github.com/dotnet/arcade build 20201211.1 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20611.1 * Update dependencies from https://github.com/dotnet/arcade build 20201214.8 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20614.8 * Update dependencies from https://github.com/dotnet/arcade build 20201215.4 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20615.4 * Update dependencies from https://github.com/dotnet/arcade build 20201216.18 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20616.18 * Update dependencies from https://github.com/dotnet/arcade build 20201218.3 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20618.3 * Update dependencies from https://github.com/dotnet/arcade build 20201221.12 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20621.12 * Update dependencies from https://github.com/dotnet/arcade build 20201223.1 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20623.1 * Update dependencies from https://github.com/dotnet/arcade build 20201230.2 Microsoft.DotNet.Arcade.Sdk From Version 5.0.0-beta.20171.1 -> To Version 6.0.0-beta.20630.2 * Update tests to target net5 * Fix NuGet feeds Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Tomas Matousek <tomat@microsoft.com>
omajid · Jan 8, 2021 · 029d70b · 029d70b
1 parent 90050a4
commit 029d70b
Show file tree

Hide file tree

Showing 61 changed files with 2,560 additions and 784 deletions.
diff --git a/NuGet.config b/NuGet.config
@@ -2,8 +2,9 @@
 <configuration>
   <packageSources>
     <clear />
-    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="dotnet-public" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/index.json" />
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
+    <add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources>
     <clear />

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -3,9 +3,9 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20171.1">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.20630.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>7dbc907fa03eacf4c57f827cb4235d77b7ed4fcd</Sha>
+      <Sha>4c8515c18ebe0071c32fed467ee3890fbd488898</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>
diff --git a/eng/common/SetupNugetSources.ps1 b/eng/common/SetupNugetSources.ps1
@@ -11,6 +11,8 @@
 # See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)`
 # from the AzureDevOps-Artifact-Feeds-Pats variable group.
 #
+# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing
+#
 #  - task: PowerShell@2
 #    displayName: Setup Private Feeds Credentials
 #    condition: eq(variables['Agent.OS'], 'Windows_NT')
@@ -83,7 +85,7 @@ function AddCredential($creds, $source, $username, $password) {
     $passwordElement.SetAttribute("value", $Password)
 }
 
-function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
+function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Username, $Password) {
     $maestroPrivateSources = $Sources.SelectNodes("add[contains(@key,'darc-int')]")
 
     Write-Host "Inserting credentials for $($maestroPrivateSources.Count) Maestro's private feeds."
@@ -94,6 +96,15 @@ function InsertMaestroPrivateFeedCredentials($Sources, $Creds, $Password) {
     }
 }
 
+function EnablePrivatePackageSources($DisabledPackageSources) {
+    $maestroPrivateSources = $DisabledPackageSources.SelectNodes("add[contains(@key,'darc-int')]")
+    ForEach ($DisabledPackageSource in $maestroPrivateSources) {
+        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)
+    }
+}
+
 if (!(Test-Path $ConfigFile -PathType Leaf)) {
   Write-PipelineTelemetryError -Category 'Build' -Message "Eng/common/SetupNugetSources.ps1 returned a non-zero exit code. Couldn't find the NuGet config file: $ConfigFile"
   ExitWithExitCode 1
@@ -123,19 +134,28 @@ if ($creds -eq $null) {
     $doc.DocumentElement.AppendChild($creds) | Out-Null
 }
 
-# Insert credential nodes for Maestro's private feeds
-InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Password $Password
-
-$dotnet3Source = $sources.SelectSingleNode("add[@key='dotnet3']")
-if ($dotnet3Source -ne $null) {
-    AddPackageSource -Sources $sources -SourceName "dotnet3-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
-    AddPackageSource -Sources $sources -SourceName "dotnet3-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
+# Check for disabledPackageSources; we'll enable any darc-int ones we find there
+$disabledSources = $doc.DocumentElement.SelectSingleNode("disabledPackageSources")
+if ($disabledSources -ne $null) {
+    Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node"
+    EnablePrivatePackageSources -DisabledPackageSources $disabledSources
 }
 
+$userName = "dn-bot"
+
+# Insert credential nodes for Maestro's private feeds
+InsertMaestroPrivateFeedCredentials -Sources $sources -Creds $creds -Username $userName -Password $Password
+
 $dotnet31Source = $sources.SelectSingleNode("add[@key='dotnet3.1']")
 if ($dotnet31Source -ne $null) {
-    AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
-    AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username "dn-bot" -Password $Password
+    AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
+    AddPackageSource -Sources $sources -SourceName "dotnet3.1-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
+}
+
+$dotnet5Source = $sources.SelectSingleNode("add[@key='dotnet5']")
+if ($dotnet5Source -ne $null) {
+    AddPackageSource -Sources $sources -SourceName "dotnet5-internal" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2" -Creds $creds -Username $userName -Password $Password
+    AddPackageSource -Sources $sources -SourceName "dotnet5-internal-transport" -SourceEndPoint "https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2" -Creds $creds -Username $userName -Password $Password
 }
 
 $doc.Save($filename)
diff --git a/eng/common/SetupNugetSources.sh b/eng/common/SetupNugetSources.sh
@@ -13,6 +13,8 @@
 # See example YAML call for this script below. Note the use of the variable `$(dn-bot-dnceng-artifact-feeds-rw)`
 # from the AzureDevOps-Artifact-Feeds-Pats variable group.
 #
+# Any disabledPackageSources entries which start with "darc-int" will be re-enabled as part of this script executing.
+#
 #  - task: Bash@3
 #    displayName: Setup Private Feeds Credentials
 #    inputs:
@@ -63,7 +65,7 @@ if [ "$?" != "0" ]; then
     ConfigNodeHeader="<configuration>"
     PackageSourcesTemplate="${TB}<packageSources>${NL}${TB}</packageSources>"
 
-    sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" NuGet.config
+    sed -i.bak "s|$ConfigNodeHeader|$ConfigNodeHeader${NL}$PackageSourcesTemplate|" $ConfigFile
 fi
 
 # Ensure there is a <packageSourceCredentials>...</packageSourceCredentials> section. 
@@ -74,58 +76,57 @@ if [ "$?" != "0" ]; then
     PackageSourcesNodeFooter="</packageSources>"
     PackageSourceCredentialsTemplate="${TB}<packageSourceCredentials>${NL}${TB}</packageSourceCredentials>"
 
-    sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" NuGet.config
+    sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourcesNodeFooter${NL}$PackageSourceCredentialsTemplate|" $ConfigFile
 fi
 
 PackageSources=()
 
-# Ensure dotnet3-internal and dotnet3-internal-transport are in the packageSources if the public dotnet3 feeds are present
-grep -i "<add key=\"dotnet3\"" $ConfigFile
-
+# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present
+grep -i "<add key=\"dotnet3.1\"" $ConfigFile
 if [ "$?" == "0" ]; then
-    grep -i "<add key=\"dotnet3-internal\">" $ConfigFile
+    grep -i "<add key=\"dotnet3.1-internal\"" $ConfigFile
     if [ "$?" != "0" ]; then
-        echo "Adding dotnet3-internal to the packageSources."
+        echo "Adding dotnet3.1-internal to the packageSources."
         PackageSourcesNodeFooter="</packageSources>"
-        PackageSourceTemplate="${TB}<add key=\"dotnet3-internal\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal/nuget/v2\" />"
+        PackageSourceTemplate="${TB}<add key=\"dotnet3.1-internal\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2\" />"
 
         sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
     fi
-    PackageSources+=('dotnet3-internal')
+    PackageSources+=('dotnet3.1-internal')
 
-    grep -i "<add key=\"dotnet3-internal-transport\"" $ConfigFile
+    grep -i "<add key=\"dotnet3.1-internal-transport\">" $ConfigFile
     if [ "$?" != "0" ]; then
-        echo "Adding dotnet3-internal-transport to the packageSources."
+        echo "Adding dotnet3.1-internal-transport to the packageSources."
         PackageSourcesNodeFooter="</packageSources>"
-        PackageSourceTemplate="${TB}<add key=\"dotnet3-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3-internal-transport/nuget/v2\" />"
+        PackageSourceTemplate="${TB}<add key=\"dotnet3.1-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2\" />"
 
         sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
     fi
-    PackageSources+=('dotnet3-internal-transport')
+    PackageSources+=('dotnet3.1-internal-transport')
 fi
 
-# Ensure dotnet3.1-internal and dotnet3.1-internal-transport are in the packageSources if the public dotnet3.1 feeds are present
-grep -i "<add key=\"dotnet3.1\"" $ConfigFile
+# Ensure dotnet5-internal and dotnet5-internal-transport are in the packageSources if the public dotnet5 feeds are present
+grep -i "<add key=\"dotnet5\"" $ConfigFile
 if [ "$?" == "0" ]; then
-    grep -i "<add key=\"dotnet3.1-internal\"" $ConfigFile
+    grep -i "<add key=\"dotnet5-internal\"" $ConfigFile
     if [ "$?" != "0" ]; then
-        echo "Adding dotnet3.1-internal to the packageSources."
+        echo "Adding dotnet5-internal to the packageSources."
         PackageSourcesNodeFooter="</packageSources>"
-        PackageSourceTemplate="${TB}<add key=\"dotnet3.1-internal\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v2\" />"
+        PackageSourceTemplate="${TB}<add key=\"dotnet5-internal\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal/nuget/v2\" />"
 
         sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
     fi
-    PackageSources+=('dotnet3.1-internal')
+    PackageSources+=('dotnet5-internal')
 
-    grep -i "<add key=\"dotnet3.1-internal-transport\">" $ConfigFile
+    grep -i "<add key=\"dotnet5-internal-transport\">" $ConfigFile
     if [ "$?" != "0" ]; then
-        echo "Adding dotnet3.1-internal-transport to the packageSources."
+        echo "Adding dotnet5-internal-transport to the packageSources."
         PackageSourcesNodeFooter="</packageSources>"
-        PackageSourceTemplate="${TB}<add key=\"dotnet3.1-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v2\" />"
+        PackageSourceTemplate="${TB}<add key=\"dotnet5-internal-transport\" value=\"https://pkgs.dev.azure.com/dnceng/internal/_packaging/dotnet5-internal-transport/nuget/v2\" />"
 
         sed -i.bak "s|$PackageSourcesNodeFooter|$PackageSourceTemplate${NL}$PackageSourcesNodeFooter|" $ConfigFile
     fi
-    PackageSources+=('dotnet3.1-internal-transport')
+    PackageSources+=('dotnet5-internal-transport')
 fi
 
 # I want things split line by line
@@ -147,3 +148,20 @@ for FeedName in ${PackageSources[@]} ; do
         sed -i.bak "s|$PackageSourceCredentialsNodeFooter|$NewCredential${NL}$PackageSourceCredentialsNodeFooter|" $ConfigFile
     fi
 done
+
+# Re-enable any entries in disabledPackageSources where the feed name contains darc-int
+grep -i "<disabledPackageSources>" $ConfigFile
+if [ "$?" == "0" ]; then
+    DisabledDarcIntSources=()
+    echo "Re-enabling any disabled \"darc-int\" package sources in $ConfigFile"
+    DisabledDarcIntSources+=$(grep -oh '"darc-int-[^"]*" value="true"' $ConfigFile  | tr -d '"')
+    for DisabledSourceName in ${DisabledDarcIntSources[@]} ; do
+        if [[ $DisabledSourceName == darc-int* ]]
+            then
+                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
+    done
+fi
diff --git a/eng/common/build.ps1 b/eng/common/build.ps1
@@ -20,8 +20,11 @@ Param(
   [switch] $publish,
   [switch] $clean,
   [switch][Alias('bl')]$binaryLog,
+  [switch][Alias('nobl')]$excludeCIBinarylog,
   [switch] $ci,
   [switch] $prepareMachine,
+  [string] $runtimeSourceFeed = '',
+  [string] $runtimeSourceFeedKey = '',
   [switch] $help,
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
@@ -58,6 +61,7 @@ function Print-Usage() {
   Write-Host "Advanced settings:"
   Write-Host "  -projects <value>       Semi-colon delimited list of sln/proj's to build. Globbing is supported (*.sln)"
   Write-Host "  -ci                     Set when running on CI server"
+  Write-Host "  -excludeCIBinarylog     Don't output binary log (short: -nobl)"
   Write-Host "  -prepareMachine         Prepare machine for CI run, clean up processes after build"
   Write-Host "  -warnAsError <value>    Sets warnaserror msbuild parameter ('true' or 'false')"
   Write-Host "  -msbuildEngine <value>  Msbuild engine to use to run build ('dotnet', 'vs', or unspecified)."
@@ -134,7 +138,9 @@ try {
   }
 
   if ($ci) {
-    $binaryLog = $true
+    if (-not $excludeCIBinarylog) {
+      $binaryLog = $true
+    }
     $nodeReuse = $false
   }
 

diff --git a/eng/common/build.sh b/eng/common/build.sh
@@ -32,6 +32,7 @@ usage()
   echo "Advanced settings:"
   echo "  --projects <value>       Project or solution file(s) to build"
   echo "  --ci                     Set when running on CI server"
+  echo "  --excludeCIBinarylog     Don't output binary log (short: -nobl)"
   echo "  --prepareMachine         Prepare machine for CI run, clean up processes after build"
   echo "  --nodeReuse <value>      Sets nodereuse msbuild parameter ('true' or 'false')"
   echo "  --warnAsError <value>    Sets warnaserror msbuild parameter ('true' or 'false')"
@@ -68,15 +69,17 @@ clean=false
 warn_as_error=true
 node_reuse=true
 binary_log=false
+exclude_ci_binary_log=false
 pipelines_log=false
 
 projects=''
 configuration='Debug'
 prepare_machine=false
 verbosity='minimal'
+runtime_source_feed=''
+runtime_source_feed_key=''
 
 properties=''
-
 while [[ $# > 0 ]]; do
   opt="$(echo "${1/#--/-}" | awk '{print tolower($0)}')"
   case "$opt" in
@@ -98,6 +101,9 @@ while [[ $# > 0 ]]; do
     -binarylog|-bl)
       binary_log=true
       ;;
+    -excludeCIBinarylog|-nobl)
+      exclude_ci_binary_log=true
+      ;;
     -pipelineslog|-pl)
       pipelines_log=true
       ;;
@@ -146,6 +152,14 @@ while [[ $# > 0 ]]; do
       node_reuse=$2
       shift
       ;;
+    -runtimesourcefeed)
+      runtime_source_feed=$2
+      shift
+      ;;
+     -runtimesourcefeedkey)
+      runtime_source_feed_key=$2
+      shift
+      ;;
     *)
       properties="$properties $1"
       ;;
@@ -156,8 +170,10 @@ done
 
 if [[ "$ci" == true ]]; then
   pipelines_log=true
-  binary_log=true
   node_reuse=false
+  if [[ "$exclude_ci_binary_log" == false ]]; then
+    binary_log=true
+  fi
 fi
 
 . "$scriptroot/tools.sh"

diff --git a/eng/common/cross/arm64/tizen-build-rootfs.sh b/eng/common/cross/arm64/tizen-build-rootfs.sh
@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+set -e
+
+__CrossDir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+__TIZEN_CROSSDIR="$__CrossDir/tizen"
+
+if [[ -z "$ROOTFS_DIR" ]]; then
+    echo "ROOTFS_DIR is not defined."
+    exit 1;
+fi
+
+TIZEN_TMP_DIR=$ROOTFS_DIR/tizen_tmp
+mkdir -p $TIZEN_TMP_DIR
+
+# Download files
+echo ">>Start downloading files"
+VERBOSE=1 $__CrossDir/tizen-fetch.sh $TIZEN_TMP_DIR
+echo "<<Finish downloading files"
+
+echo ">>Start constructing Tizen rootfs"
+TIZEN_RPM_FILES=`ls $TIZEN_TMP_DIR/*.rpm`
+cd $ROOTFS_DIR
+for f in $TIZEN_RPM_FILES; do
+    rpm2cpio $f  | cpio -idm --quiet
+done
+echo "<<Finish constructing Tizen rootfs"
+
+# Cleanup tmp
+rm -rf $TIZEN_TMP_DIR
+
+# Configure Tizen rootfs
+echo ">>Start configuring Tizen rootfs"
+ln -sfn asm-arm64 ./usr/include/asm
+patch -p1 < $__TIZEN_CROSSDIR/tizen.patch
+echo "<<Finish configuring Tizen rootfs"