Merged PR 38126: [internal/release/6.0] Merge from public

Merge from public release/6.0 to internal/release/6.0 and resolve conflicts if necessary

Author: vseanreesermsft

eng/Version.Details.xml

@@ -280,22 +280,22 @@
       <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
       <Sha>34a109148c7d8a2c8e6431e83e4bce5712dd8083</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24162.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="6.0.0-beta.24163.13">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
+      <Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
       <SourceBuild RepoName="arcade" ManagedOnly="true" />
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24162.4">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="6.0.0-beta.24163.13">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
+      <Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24162.4">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="6.0.0-beta.24163.13">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
+      <Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24162.4">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="6.0.0-beta.24163.13">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>c80f6c7bcfdd0e62a3012f9a97ab52be477c7d75</Sha>
+      <Sha>100394106fe203c112ab72bcc1576fb3753f7910</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

eng/Versions.props

@@ -131,8 +131,8 @@
     <MicrosoftEntityFrameworkCoreVersion>6.0.29</MicrosoftEntityFrameworkCoreVersion>
     <MicrosoftEntityFrameworkCoreDesignVersion>6.0.29</MicrosoftEntityFrameworkCoreDesignVersion>
     <!-- Packages from dotnet/arcade -->
-    <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24162.4</MicrosoftDotNetBuildTasksInstallersVersion>
-    <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24162.4</MicrosoftDotNetBuildTasksTemplatingVersion>
+    <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksInstallersVersion>
+    <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.24163.13</MicrosoftDotNetBuildTasksTemplatingVersion>
   </PropertyGroup>
   <!--
 

eng/common/SetupNugetSources.ps1

@@ -49,7 +49,7 @@ function AddPackageSource($sources, $SourceName, $SourceEndPoint, $creds, $Usern
         Write-Host "Package source $SourceName already present."
     }
 
-    AddCredential -Creds $creds -Source $SourceName -Username $Username -Password $pwd
+    AddCredential -Creds $creds -Source $SourceName -Username $Username -pwd $pwd
 }
 
 # Add a credential node for the specified source

global.json

@@ -29,7 +29,7 @@
   },
   "msbuild-sdks": {
     "Yarn.MSBuild": "1.22.19",
-    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24162.4",
-    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24162.4"
+    "Microsoft.DotNet.Arcade.Sdk": "6.0.0-beta.24163.13",
+    "Microsoft.DotNet.Helix.Sdk": "6.0.0-beta.24163.13"
   }
 }