Skip to content

Commit

Permalink
Merge pull request #8584 from dotnet/darc-main-cec7fee7-4d43-4436-8bf…
Browse files Browse the repository at this point in the history
…f-6907cd9105a4

[main] Update dependencies from dotnet/arcade
  • Loading branch information
v-wuzhai authored Dec 2, 2024
2 parents 3519ae9 + 4170e17 commit 157cd53
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 10 deletions.
8 changes: 4 additions & 4 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24577.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24578.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d0f89c635d780e183a97ad86af4f3c8d7e95977f</Sha>
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24577.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24578.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>d0f89c635d780e183a97ad86af4f3c8d7e95977f</Sha>
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="System.Formats.Asn1" Version="8.0.1">
Expand Down
6 changes: 1 addition & 5 deletions eng/common/native/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,15 +44,11 @@ case "$os" in
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
# Skip brew update for now, see https://github.com/actions/setup-python/issues/577
# brew update --preinstall

# Temporarily uninstall pkg-config@0.29.2 to work around https://github.com/actions/runner-images/issues/10984
brew uninstall --ignore-dependencies --force pkg-config@0.29.2

brew bundle --no-upgrade --no-lock --file=- <<EOF
brew "cmake"
brew "icu4c"
brew "openssl@3"
brew "pkg-config"
brew "pkgconf"
brew "python3"
brew "pigz"
EOF
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"dotnet": "9.0.100"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24577.1"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24578.2"
}
}

0 comments on commit 157cd53

Please sign in to comment.