mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[main] Update dependencies from dotnet/arcade (#19024)

Browse source
This commit is contained in:
JL03-Yue 2024-03-13 10:36:05 -07:00 committed by GitHub
commit a2a017c04e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
eng/Version.Details.xml
View file

@ -243,17 +243,17 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24161.5"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24162.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>39839f3007d9f3bbabf7a4b6a96ef5dd6be9e5ac</Sha> <Sha>1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24161.5"> <Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24162.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>39839f3007d9f3bbabf7a4b6a96ef5dd6be9e5ac</Sha> <Sha>1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24161.5"> <Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24162.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>39839f3007d9f3bbabf7a4b6a96ef5dd6be9e5ac</Sha> <Sha>1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24161.1"> <Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24161.1">
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
@ -263,14 +263,14 @@
<Uri>https://github.com/dotnet/arcade-services</Uri> <Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>287772f0ae8b40573f97342eb83fdeee7a136bea</Sha> <Sha>287772f0ae8b40573f97342eb83fdeee7a136bea</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24161.5"> <Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24162.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>39839f3007d9f3bbabf7a4b6a96ef5dd6be9e5ac</Sha> <Sha>1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8</Sha>
</Dependency> </Dependency>
<!-- Intermediate is necessary for source build. --> <!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24161.5"> <Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24162.2">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>39839f3007d9f3bbabf7a4b6a96ef5dd6be9e5ac</Sha> <Sha>1c8e12b71c28f5dc6626b529b08abefdbb7ca6e8</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" /> <SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency> </Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13"> <Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">

2
eng/Versions.props
View file

@ -39,7 +39,7 @@
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade --> <!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24161.5</MicrosoftDotNetBuildTasksInstallersPackageVersion> <MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24162.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services --> <!-- Dependency from https://github.com/dotnet/arcade-services -->

6
eng/common/native/init-compiler.sh
View file

@ -63,7 +63,7 @@ if [ -z "$CLR_CC" ]; then
# Set default versions # Set default versions
if [ -z "$majorVersion" ]; then if [ -z "$majorVersion" ]; then
# note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero. # note: gcc (all versions) and clang versions higher than 6 do not have minor version in file name, if it is zero.
if [ "$compiler" = "clang" ]; then versions="17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5" if [ "$compiler" = "clang" ]; then versions="18 17 16 15 14 13 12 11 10 9 8 7 6.0 5.0 4.0 3.9 3.8 3.7 3.6 3.5"
elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi elif [ "$compiler" = "gcc" ]; then versions="13 12 11 10 9 8 7 6 5 4.9"; fi
for version in $versions; do for version in $versions; do
@ -125,8 +125,8 @@ if [ -z "$CC" ]; then
exit 1 exit 1
fi fi
# Only lld version >= 9 can be considered stable. lld doesn't support s390x. # Only lld version >= 9 can be considered stable. lld supports s390x starting from 18.0.
if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && [ "$build_arch" != "s390x" ]; then if [ "$compiler" = "clang" ] && [ -n "$majorVersion" ] && [ "$majorVersion" -ge 9 ] && ([ "$build_arch" != "s390x" ] || [ "$majorVersion" -ge 18 ]); then
if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then if "$CC" -fuse-ld=lld -Wl,--version >/dev/null 2>&1; then
LDFLAGS="-fuse-ld=lld" LDFLAGS="-fuse-ld=lld"
fi fi

4
global.json
View file

@ -11,7 +11,7 @@
"cmake": "latest" "cmake": "latest"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24161.5", "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24162.2",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24161.5" "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24162.2"
} }
} }