Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -384,31 +384,31 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4389f9c54d070ca5e0cf7c4931aff56fe36d667f</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24564.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24572.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
<Sha>7d955f9f470465e144c76d47fd2596a0e4c02a21</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24564.1">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24572.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
<Sha>7d955f9f470465e144c76d47fd2596a0e4c02a21</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24564.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24572.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
<Sha>7d955f9f470465e144c76d47fd2596a0e4c02a21</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24564.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.24572.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
<Sha>7d955f9f470465e144c76d47fd2596a0e4c02a21</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24564.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24572.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
<Sha>7d955f9f470465e144c76d47fd2596a0e4c02a21</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24564.1">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="10.0.0-beta.24572.3">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c1852b9ac37df9a86630c2f078dbee43f7b186e7</Sha>
<Sha>7d955f9f470465e144c76d47fd2596a0e4c02a21</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.1.0-preview.1.24568.3">
<Uri>https://github.com/dotnet/extensions</Uri>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -165,10 +165,10 @@
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24564.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24564.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24564.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24564.1</MicrosoftSourceBuildIntermediatearcadeVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>10.0.0-beta.24572.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.24572.3</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>10.0.0-beta.24572.3</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftSourceBuildIntermediatearcadeVersion>10.0.0-beta.24572.3</MicrosoftSourceBuildIntermediatearcadeVersion>
<!-- Packages from dotnet/source-build-externals -->
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>10.0.0-alpha.1.24561.2</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
<!-- Packages from dotnet/source-build-reference-packages -->
Expand Down
4 changes: 4 additions & 0 deletions eng/common/native/install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ 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 [email protected] to work around https://github.com/actions/runner-images/issues/10984
brew uninstall --ignore-dependencies --force [email protected]

brew bundle --no-upgrade --no-lock --file=- <<EOF
brew "cmake"
brew "icu4c"
Expand Down
4 changes: 2 additions & 2 deletions global.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"jdk": "11.0.24"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24564.1"
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24572.3",
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24572.3"
}
}
Loading