dotnet
/
aspnetcore
зеркало из https://github.com/dotnet/aspnetcore.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update dependencies from https://github.com/dotnet/arcade build 20240407.1 (#55012) 

[main] Update dependencies from dotnet/arcade
This commit is contained in:
dotnet-maestro[bot] 2024-04-08 14:14:49 +00:00 коммит произвёл GitHub
Родитель 6196f76672
Коммит b5a99658c3
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
8 изменённых файлов: 33 добавлений и 26 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

24
eng/Version.Details.xml
Просмотреть файл

@ -383,31 +383,31 @@
<Uri>https://github.com/dotnet/winforms</Uri>
<Sha>0bf0cd0a97f1f76e133879501e3553d4b7825dbf</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24179.6">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24207.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
</Dependency>
<!-- Intermediate is necessary for source build. -->
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24179.6">
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="9.0.0-beta.24207.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24179.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.24207.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24179.6">
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="9.0.0-beta.24207.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24179.6">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24207.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24179.6">
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="9.0.0-beta.24207.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>986a55a9c7f1ef547bc705d6adada5e0c2217819</Sha>
<Sha>9e3b333509ec2990dd20fbf01f50fd42d7f23d56</Sha>
</Dependency>
<Dependency Name="Microsoft.Extensions.Diagnostics.Testing" Version="9.0.0-preview.3.24175.2">
<Uri>https://github.com/dotnet/extensions</Uri>

8
eng/Versions.props
Просмотреть файл

@ -159,10 +159,10 @@
<NuGetVersioningVersion>6.2.4</NuGetVersioningVersion>
<NuGetFrameworksVersion>6.2.4</NuGetFrameworksVersion>
<!-- Packages from dotnet/arcade -->
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24179.6</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24179.6</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24179.6</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24179.6</MicrosoftSourceBuildIntermediatearcadeVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetBuildTasksTemplatingVersion>9.0.0-beta.24207.1</MicrosoftDotNetBuildTasksTemplatingVersion>
<MicrosoftDotNetRemoteExecutorVersion>9.0.0-beta.24207.1</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftSourceBuildIntermediatearcadeVersion>9.0.0-beta.24207.1</MicrosoftSourceBuildIntermediatearcadeVersion>
<!-- Packages from dotnet/source-build-externals -->
<MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>9.0.0-alpha.1.24201.3</MicrosoftSourceBuildIntermediatesourcebuildexternalsVersion>
<!-- Packages from dotnet/source-build-reference-packages -->

11
eng/common/cross/build-rootfs.sh
Просмотреть файл

@ -444,11 +444,18 @@ __RootfsDir="$( cd "$__RootfsDir" && pwd )"
if [[ "$__CodeName" == "alpine" ]]; then
__ApkToolsVersion=2.12.11
__ApkToolsSHA512SUM=53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33
__ApkToolsDir="$(mktemp -d)"
__ApkKeysDir="$(mktemp -d)"
wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic//v$__ApkToolsVersion/x86_64/apk.static" -P "$__ApkToolsDir"
arch="$(uname -m)"
wget "https://gitlab.alpinelinux.org/api/v4/projects/5/packages/generic/v$__ApkToolsVersion/$arch/apk.static" -P "$__ApkToolsDir"
if [[ "$arch" == "x86_64" ]]; then
__ApkToolsSHA512SUM="53e57b49230da07ef44ee0765b9592580308c407a8d4da7125550957bb72cb59638e04f8892a18b584451c8d841d1c7cb0f0ab680cc323a3015776affaa3be33"
elif [[ "$arch" == "aarch64" ]]; then
__ApkToolsSHA512SUM="9e2b37ecb2b56c05dad23d379be84fd494c14bd730b620d0d576bda760588e1f2f59a7fcb2f2080577e0085f23a0ca8eadd993b4e61c2ab29549fdb71969afd0"
else
echo "WARNING: add missing hash for your host architecture. To find the value, use: `find /tmp -name apk.static -exec sha512sum {} \;`"
fi
echo "$__ApkToolsSHA512SUM $__ApkToolsDir/apk.static" | sha512sum -c
chmod +x "$__ApkToolsDir/apk.static"

2
eng/common/templates-official/job/onelocbuild.yml
Просмотреть файл

@ -56,7 +56,7 @@ jobs:
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022
image: 1es-windows-2022-pt
os: windows
steps:

2
eng/common/templates-official/job/source-build.yml
Просмотреть файл

@ -52,7 +52,7 @@ jobs:
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')]
image: 1es-mariner-2
image: 1es-mariner-2-pt
os: linux
${{ if ne(parameters.platform.pool, '') }}:

6
eng/common/templates-official/post-build/post-build.yml
Просмотреть файл

@ -110,7 +110,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022
image: 1es-windows-2022-pt
os: windows
steps:
@ -150,7 +150,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022
image: 1es-windows-2022-pt
os: windows
steps:
- template: setup-maestro-vars.yml
@ -208,7 +208,7 @@ stages:
# If it's not devdiv, it's dnceng
${{ else }}:
name: $(DncEngInternalBuildPool)
image: 1es-windows-2022
image: 1es-windows-2022-pt
os: windows
steps:
- template: setup-maestro-vars.yml

2
eng/common/templates-official/variables/pool-providers.yml
Просмотреть файл

@ -23,7 +23,7 @@
#
# pool:
# name: $(DncEngInternalBuildPool)
# image: 1es-windows-2022
# image: 1es-windows-2022-pt
variables:
# Coalesce the target and source branches so we know when a PR targets a release branch

4
global.json
Просмотреть файл

@ -27,7 +27,7 @@
"jdk": "11.0.22"
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24179.6",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24179.6"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24207.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24207.1"
}
}