Merge in 'release/6.0' changes

dotnet · Mar 14, 2024 · 4191554 · 4191554
2 parents 8af6cdf + ee2617e
commit 4191554
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
@@ -47,13 +47,13 @@
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <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>
     </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>
diff --git a/eng/common/SetupNugetSources.ps1 b/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

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "6.0.127",
+    "dotnet": "6.0.128",
     "runtimes": {
       "dotnet": [
         "3.1.32",
@@ -13,12 +13,12 @@
     }
   },
   "sdk": {
-    "version": "6.0.127",
+    "version": "6.0.128",
     "allowPrerelease": true,
     "rollForward": "latestMajor"
   },
   "msbuild-sdks": {
-    "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"
   }
 }