Skip to content

[main] Update dependencies from dotnet/arcade #8995

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

Merged
merged 1 commit into from
Apr 6, 2024
Merged

[main] Update dependencies from dotnet/arcade #8995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 @@ -157,25 +157,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24203.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.24205.14">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24203.1">
<Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="9.0.0-beta.24205.14">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24203.1">
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.24205.14">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.ApiCompat" Version="9.0.0-beta.24053.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>f4e11a15c7b8a949d4a366e792a9843ff6e88cd5</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24203.1">
<Dependency Name="Microsoft.DotNet.GenAPI" Version="9.0.0-beta.24205.14">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>532f956a119bce77ca279994054d08dbc24418f7</Sha>
<Sha>f975f8677ccfd386a91acd3726cd3cbcdc6b57e0</Sha>
</Dependency>
<Dependency Name="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0-beta.23409.2">
<Uri>https://github.com/dotnet/sourcelink</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 @@ -49,7 +49,7 @@
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>9.0.0-beta.24053.1</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24203.1</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>9.0.0-beta.24205.14</MicrosoftDotNetCodeAnalysisPackageVersion>
</PropertyGroup>
<!-- Sourcelink -->
<PropertyGroup>
Expand Down
11 changes: 9 additions & 2 deletions eng/common/cross/build-rootfs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/job/onelocbuild.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/job/source-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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, '') }}:
Expand Down
6 changes: 3 additions & 3 deletions eng/common/templates-official/post-build/post-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion eng/common/templates-official/variables/pool-providers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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 @@ -12,8 +12,8 @@
}
},
"msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24203.1",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24203.1"
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24205.14",
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24205.14"
},
"sdk": {
"version": "9.0.100-preview.1.24101.2"
Expand Down