Update dependencies from https://github.com/dotnet/arcade build 20240614.1 (#412)
[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot]
GitHub
Родитель
f1b0f9c44d
Коммит
9f4a15c6b3
|
|
@ -11,25 +11,25 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24312.1">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24314.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>a7f9929d8dfde18489958185375b50ad49fa7a58</Sha>
|
||||
<Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24312.1">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24314.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>a7f9929d8dfde18489958185375b50ad49fa7a58</Sha>
|
||||
<Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24312.1">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="9.0.0-beta.24314.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>a7f9929d8dfde18489958185375b50ad49fa7a58</Sha>
|
||||
<Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.8.1-beta.24312.1">
|
||||
<Dependency Name="Microsoft.DotNet.XUnitConsoleRunner" Version="2.8.1-beta.24314.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>a7f9929d8dfde18489958185375b50ad49fa7a58</Sha>
|
||||
<Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24312.1">
|
||||
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24314.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>a7f9929d8dfde18489958185375b50ad49fa7a58</Sha>
|
||||
<Sha>92a725aa4d9d6c13dc5229597b51b0b165b8b535</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
|||
|
|
@ -13,10 +13,10 @@
|
|||
<MicrosoftCodeAnalysisAnalyzersVersion>3.3.4</MicrosoftCodeAnalysisAnalyzersVersion>
|
||||
<MicrosoftCodeAnalysisVersion>4.10.0-3.24303.7</MicrosoftCodeAnalysisVersion>
|
||||
<!-- arcade -->
|
||||
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24312.1</MicrosoftDotNetBuildTasksTemplatingVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24312.1</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24312.1</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.8.1-beta.24312.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
|
||||
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24314.1</MicrosoftDotNetBuildTasksTemplatingVersion>
|
||||
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24314.1</MicrosoftDotNetRemoteExecutorVersion>
|
||||
<MicrosoftDotNetXUnitExtensionsVersion>9.0.0-beta.24314.1</MicrosoftDotNetXUnitExtensionsVersion>
|
||||
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.8.1-beta.24314.1</MicrosoftDotNetXUnitConsoleRunnerVersion>
|
||||
<!--
|
||||
These are used as reference assemblies only, so they must not take a ProdCon/source-build
|
||||
version. Insert "RefOnly" to avoid assignment via PVP.
|
||||
|
|
|
|||
|
|
@ -131,6 +131,7 @@ __AlpineKeys='
|
|||
__Keyring=
|
||||
__SkipSigCheck=0
|
||||
__UseMirror=0
|
||||
__UseDeb822Format=0
|
||||
|
||||
__UnprocessedBuildArgs=
|
||||
while :; do
|
||||
|
|
@ -181,7 +182,6 @@ while :; do
|
|||
__AlpinePackages="${__AlpinePackages// lldb-dev/}"
|
||||
__QEMUArch=riscv64
|
||||
__UbuntuArch=riscv64
|
||||
__UbuntuRepo="http://deb.debian.org/debian"
|
||||
__UbuntuPackages="${__UbuntuPackages// libunwind8-dev/}"
|
||||
unset __LLDB_Package
|
||||
|
||||
|
|
@ -288,6 +288,12 @@ while :; do
|
|||
__CodeName=jammy
|
||||
fi
|
||||
;;
|
||||
noble) # Ubuntu 24.04
|
||||
if [[ "$__CodeName" != "jessie" ]]; then
|
||||
__CodeName=noble
|
||||
fi
|
||||
__UseDeb822Format=1
|
||||
;;
|
||||
jessie) # Debian 8
|
||||
__CodeName=jessie
|
||||
|
||||
|
|
@ -732,8 +738,11 @@ elif [[ -n "$__CodeName" ]]; then
|
|||
fi
|
||||
|
||||
# shellcheck disable=SC2086
|
||||
echo running debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
|
||||
debootstrap "--variant=minbase" $__Keyring --arch "$__UbuntuArch" "$__CodeName" "$__RootfsDir" "$__UbuntuRepo"
|
||||
cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list"
|
||||
mkdir -p "$__RootfsDir/etc/apt/sources.list.d/"
|
||||
grep -q "Types:" "$__CrossDir/$__BuildArch/sources.list.$__CodeName" && filename="$__CodeName.sources" || filename="$__CodeName.list"
|
||||
cp "$__CrossDir/$__BuildArch/sources.list.$__CodeName" "$__RootfsDir/etc/apt/sources.list.d/$filename"
|
||||
chroot "$__RootfsDir" apt-get update
|
||||
chroot "$__RootfsDir" apt-get -f -y install
|
||||
# shellcheck disable=SC2086
|
||||
|
|
|
|||
|
|
@ -0,0 +1,11 @@
|
|||
Types: deb
|
||||
URIs: http://ports.ubuntu.com/ubuntu-ports/
|
||||
Suites: noble noble-updates noble-backports
|
||||
Components: main universe restricted multiverse
|
||||
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
|
||||
|
||||
Types: deb
|
||||
URIs: http://ports.ubuntu.com/ubuntu-ports/
|
||||
Suites: noble-security
|
||||
Components: main universe restricted multiverse
|
||||
Signed-By: /usr/share/keyrings/ubuntu-archive-keyring.gpg
|
||||
|
|
@ -5,6 +5,13 @@ param(
|
|||
[Parameter(Mandatory=$true)][string] $PackagesPath # Path to where the packages to be validated are
|
||||
)
|
||||
|
||||
# `tools.ps1` checks $ci to perform some actions. Since the post-build
|
||||
# scripts don't necessarily execute in the same agent that run the
|
||||
# build.ps1/sh script this variable isn't automatically set.
|
||||
$ci = $true
|
||||
$disableConfigureToolsetImport = $true
|
||||
. $PSScriptRoot\..\tools.ps1
|
||||
|
||||
try {
|
||||
& $PSScriptRoot\nuget-verification.ps1 ${PackagesPath}\*.nupkg
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
{
|
||||
"tools": {
|
||||
"dotnet": "9.0.100-preview.4.24267.66"
|
||||
"dotnet": "9.0.100-preview.5.24307.3"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24312.1",
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24314.1",
|
||||
"Microsoft.Build.Traversal": "3.4.0"
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче