Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[main] Update dependencies from dotnet/arcade #18301

Merged
merged 3 commits into from
Jan 20, 2024
Merged

[main] Update dependencies from dotnet/arcade #18301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ef40ca
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jan 19, 2024
ab7f06d
Merge branch 'main' into darc-main-cca34c37-70c2-4ad7-9600-8803e0df6d18
mthalman Jan 19, 2024
dc1177f
Update dependencies from https://github.com/dotnet/arcade build 20240…
dotnet-maestro[bot] Jan 20, 2024
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
16 changes: 8 additions & 8 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,18 +206,18 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24068.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c246c9d7bfb98646ec52a18471d075219b26dccc</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24068.1">
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c246c9d7bfb98646ec52a18471d075219b26dccc</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24068.1">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c246c9d7bfb98646ec52a18471d075219b26dccc</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23621.3">
<Uri>https://github.com/dotnet/arcade-services</Uri>
Expand All @@ -227,9 +227,9 @@
<Uri>https://github.com/dotnet/arcade-services</Uri>
<Sha>702f946f89ace6197fdca2ac309d32187c4bc1bd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24068.1">
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.24069.2">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>c246c9d7bfb98646ec52a18471d075219b26dccc</Sha>
<Sha>abddd0bd5145578246dcadda264c7557f2a935a9</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="9.0.0-alpha.1.23612.13">
<Uri>https://github.com/dotnet/runtime</Uri>
Expand Down
2 changes: 1 addition & 1 deletion eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24068.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.24069.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
</PropertyGroup>
<PropertyGroup>
<!-- Dependency from https://github.com/dotnet/arcade-services -->
Expand Down
16 changes: 8 additions & 8 deletions eng/common/cross/build-rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ usage()
echo "BuildArch can be: arm(default), arm64, armel, armv6, ppc64le, riscv64, s390x, x64, x86"
echo "CodeName - optional, Code name for Linux, can be: xenial(default), zesty, bionic, alpine"
echo " for alpine can be specified with version: alpineX.YY or alpineedge"
echo " for FreeBSD can be: freebsd12, freebsd13"
echo " for FreeBSD can be: freebsd13, freebsd14"
echo " for illumos can be: illumos"
echo " for Haiku can be: haiku."
echo "lldbx.y - optional, LLDB version, can be: lldb3.9(default), lldb4.0, lldb5.0, lldb6.0 no-lldb. Ignored for alpine and FreeBSD"
Expand Down Expand Up @@ -71,9 +71,9 @@ __AlpinePackages+=" krb5-dev"
__AlpinePackages+=" openssl-dev"
__AlpinePackages+=" zlib-dev"

__FreeBSDBase="12.4-RELEASE"
__FreeBSDPkg="1.17.0"
__FreeBSDABI="12"
__FreeBSDBase="13.2-RELEASE"
__FreeBSDPkg="1.20.0"
__FreeBSDABI="13"
__FreeBSDPackages="libunwind"
__FreeBSDPackages+=" icu"
__FreeBSDPackages+=" libinotify"
Expand Down Expand Up @@ -334,14 +334,14 @@ while :; do
__AlpineVersion="$__AlpineMajorVersion.$__AlpineMinoVersion"
fi
;;
freebsd12)
freebsd13)
__CodeName=freebsd
__SkipUnmount=1
;;
freebsd13)
freebsd14)
__CodeName=freebsd
__FreeBSDBase="13.2-RELEASE"
__FreeBSDABI="13"
__FreeBSDBase="14.0-RELEASE"
__FreeBSDABI="14"
__SkipUnmount=1
;;
illumos)
Expand Down
4 changes: 2 additions & 2 deletions global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"cmake": "3.21.0"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24068.1",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24068.1"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24069.2",
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24069.2"
}
}