Skip to content

Commit 830cf11

Browse files
[main] Update dependencies from dotnet/arcade (#45222)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Viktor Hofer <[email protected]>
1 parent 8ca3acd commit 830cf11

File tree

5 files changed

+21
-132
lines changed

5 files changed

+21
-132
lines changed

eng/Version.Details.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24577.1">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24578.2">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>d0f89c635d780e183a97ad86af4f3c8d7e95977f</Sha>
594+
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24577.1">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24578.2">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>d0f89c635d780e183a97ad86af4f3c8d7e95977f</Sha>
598+
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24577.1">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24578.2">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>d0f89c635d780e183a97ad86af4f3c8d7e95977f</Sha>
602+
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24577.1">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24578.2">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>d0f89c635d780e183a97ad86af4f3c8d7e95977f</Sha>
606+
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24577.1">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24578.2">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>d0f89c635d780e183a97ad86af4f3c8d7e95977f</Sha>
610+
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24577.1">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24578.2">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>d0f89c635d780e183a97ad86af4f3c8d7e95977f</Sha>
614+
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24577.1">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24578.2">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>d0f89c635d780e183a97ad86af4f3c8d7e95977f</Sha>
619+
<Sha>e8de3415124309210e4cbd0105e4a9da8dc01696</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-alpha.1.24570.9">

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -276,10 +276,10 @@
276276
</PropertyGroup>
277277
<PropertyGroup>
278278
<!-- Dependencies from https://github.com/dotnet/arcade -->
279-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24577.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
280-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24577.1</MicrosoftDotNetSignToolVersion>
281-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24577.1</MicrosoftDotNetXliffTasksVersion>
282-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24577.1</MicrosoftDotNetXUnitExtensionsVersion>
279+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24578.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
280+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24578.2</MicrosoftDotNetSignToolVersion>
281+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24578.2</MicrosoftDotNetXliffTasksVersion>
282+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24578.2</MicrosoftDotNetXUnitExtensionsVersion>
283283
</PropertyGroup>
284284
<PropertyGroup>
285285
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

eng/common/native/install-dependencies.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,15 +44,11 @@ case "$os" in
4444
export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
4545
# Skip brew update for now, see https://github.com/actions/setup-python/issues/577
4646
# brew update --preinstall
47-
48-
# Temporarily uninstall [email protected] to work around https://github.com/actions/runner-images/issues/10984
49-
brew uninstall --ignore-dependencies --force [email protected]
50-
5147
brew bundle --no-upgrade --no-lock --file=- <<EOF
5248
brew "cmake"
5349
brew "icu4c"
5450
brew "openssl@3"
55-
brew "pkg-config"
51+
brew "pkgconf"
5652
brew "python3"
5753
brew "pigz"
5854
EOF

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24577.1",
21-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24577.1",
20+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24578.2",
21+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24578.2",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

src/SourceBuild/patches/arcade/0002-Ensure-we-rewrite-all-entries-even-if-not-signed-sec.patch

Lines changed: 0 additions & 107 deletions
This file was deleted.

0 commit comments

Comments
 (0)