Skip to content

Commit

Permalink
Update dependencies from https://github.com/dotnet/arcade build 20240…
Browse files Browse the repository at this point in the history
…626.1 (#4285)

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk
 From Version 9.0.0-beta.24324.8 -> To Version 9.0.0-beta.24326.1

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
  • Loading branch information
dotnet-maestro[bot] and dotnet-maestro[bot] committed Jun 26, 2024
1 parent 65f7f0f commit 45c7a51
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 8 deletions.
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24324.8">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24326.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>79f0a2e647b3dcec3a88dcdcb9037736c21fe965</Sha>
<Sha>804ee9af4eed5ca4ce5ead1bc48e388b17056cb6</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24324.8">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24326.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>79f0a2e647b3dcec3a88dcdcb9037736c21fe965</Sha>
<Sha>804ee9af4eed5ca4ce5ead1bc48e388b17056cb6</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 3 additions & 1 deletion eng/common/core-templates/steps/enable-internal-sources.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ steps:
displayName: Setup Internal Feeds
inputs:
filePath: $(Build.SourcesDirectory)/eng/common/SetupNugetSources.ps1
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config
arguments: -ConfigFile $(Build.SourcesDirectory)/NuGet.config -Password $Env:Token
env:
Token: ${{ parameters.legacyCredential }}
# If running on dnceng (internal project), just use the default behavior for NuGetAuthenticate.
# If running on DevDiv, NuGetAuthenticate is not really an option. It's scoped to a single feed, and we have many feeds that
# may be added. Instead, we'll use the traditional approach (add cred to nuget.config), but use an account token.
Expand Down
3 changes: 3 additions & 0 deletions eng/common/dotnet-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ case $cpuname in
i[3-6]86)
buildarch=x86
;;
riscv64)
buildarch=riscv64
;;
*)
echo "Unknown CPU $cpuname detected, treating it as x64"
buildarch=x64
Expand Down
3 changes: 2 additions & 1 deletion eng/common/native/CommonLibrary.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,8 @@ function Get-MachineArchitecture {
if (($ProcessorArchitecture -Eq "AMD64") -Or
($ProcessorArchitecture -Eq "IA64") -Or
($ProcessorArchitecture -Eq "ARM64") -Or
($ProcessorArchitecture -Eq "LOONGARCH64")) {
($ProcessorArchitecture -Eq "LOONGARCH64") -Or
($ProcessorArchitecture -Eq "RISCV64")) {
return "x64"
}
return "x86"
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"dotnet": "9.0.100-preview.5.24307.3"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24324.8",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24324.8"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24326.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24326.1"
},
"native-tools": {
"python3": "3.7.1"
Expand Down

0 comments on commit 45c7a51

Please sign in to comment.