Skip to content

Commit b1bc853

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20250422.2 (#1231)
Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk From Version 10.0.0-beta.25217.1 -> To Version 10.0.0-beta.25222.2 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 8bad251 commit b1bc853

File tree

5 files changed

+10
-15
lines changed

5 files changed

+10
-15
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88
<SourceBuild RepoName="source-build-externals" ManagedOnly="true" />
99
</Dependency>
1010
<!-- Intermediate is necessary for source build. -->
11-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25217.1">
11+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25222.2">
1212
<Uri>https://github.com/dotnet/arcade</Uri>
13-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
13+
<Sha>80d7b4ee29c31c0886b139ad02d85da48b543cd6</Sha>
1414
<SourceBuild RepoName="arcade" ManagedOnly="true" />
1515
</Dependency>
16-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25217.1">
16+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25222.2">
1717
<Uri>https://github.com/dotnet/arcade</Uri>
18-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
18+
<Sha>80d7b4ee29c31c0886b139ad02d85da48b543cd6</Sha>
1919
</Dependency>
2020
<Dependency Name="Microsoft.DotNet.GenAPI.Task" Version="10.0.100-preview.4.25220.1">
2121
<Uri>https://github.com/dotnet/sdk</Uri>

eng/common/core-templates/jobs/jobs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ jobs:
9696
${{ parameter.key }}: ${{ parameter.value }}
9797

9898
- ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}:
99-
- ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}:
99+
- ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, ''), eq(parameters.isAssetlessBuild, true)) }}:
100100
- template: ../job/publish-build-assets.yml
101101
parameters:
102102
is1ESPipeline: ${{ parameters.is1ESPipeline }}
@@ -112,7 +112,7 @@ jobs:
112112
- Source_Build_Complete
113113

114114
runAsPublic: ${{ parameters.runAsPublic }}
115-
publishAssetsImmediately: ${{ parameters.publishAssetsImmediately }}
115+
publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }}
116116
isAssetlessBuild: ${{ parameters.isAssetlessBuild }}
117117
enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }}
118118
artifactsPublishingAdditionalParameters: ${{ parameters.artifactsPublishingAdditionalParameters }}

eng/common/cross/arm64/tizen/tizen.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
55
Use the shared library, but some functions are only in
66
the static library, so try that secondarily. */
77
OUTPUT_FORMAT(elf64-littleaarch64)
8-
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-aarch64.so.1 ) )
8+
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-aarch64.so.1 ) )
99
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-aarch64.so.1 ) )

eng/common/cross/tizen-fetch.sh

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -156,13 +156,8 @@ fetch_tizen_pkgs()
156156
done
157157
}
158158

159-
if [ "$TIZEN_ARCH" == "riscv64" ]; then
160-
BASE="Tizen-Base-RISCV"
161-
UNIFIED="Tizen-Unified-RISCV"
162-
else
163-
BASE="Tizen-Base"
164-
UNIFIED="Tizen-Unified"
165-
fi
159+
BASE="Tizen-Base"
160+
UNIFIED="Tizen-Unified"
166161

167162
Inform "Initialize ${TIZEN_ARCH} base"
168163
fetch_tizen_pkgs_init standard $BASE

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"dotnet": "10.0.100-preview.3.25201.16"
44
},
55
"msbuild-sdks": {
6-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25217.1",
6+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25222.2",
77
"Microsoft.Build.NoTargets": "3.7.0"
88
}
99
}

0 commit comments

Comments
 (0)