Skip to content

Commit 47b81ca

Browse files
Update dependencies from https://github.com/dotnet/arcade build 20251105.4 (#866)
[main] Update dependencies from dotnet/arcade
1 parent a7a5fd9 commit 47b81ca

File tree

6 files changed

+34
-6
lines changed

6 files changed

+34
-6
lines changed

eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,13 +65,13 @@
6565
</Dependency>
6666
</ProductDependencies>
6767
<ToolsetDependencies>
68-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25515.2">
68+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.25555.4">
6969
<Uri>https://github.com/dotnet/arcade</Uri>
70-
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
70+
<Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
7171
</Dependency>
72-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25515.2">
72+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="9.0.0-beta.25555.4">
7373
<Uri>https://github.com/dotnet/arcade</Uri>
74-
<Sha>6666973b629b24e259162dba03486c23af464bab</Sha>
74+
<Sha>9eaf7b289d5003a94ee23658f057a6c06ddcd570</Sha>
7575
</Dependency>
7676
</ToolsetDependencies>
7777
</Dependencies>

eng/common/core-templates/job/publish-build-assets.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,11 @@ jobs:
145145
PromoteToChannelIds: ${{ parameters.PromoteToChannelIds }}
146146
is1ESPipeline: ${{ parameters.is1ESPipeline }}
147147

148+
# Darc is targeting 8.0, so make sure it's installed
149+
- task: UseDotNet@2
150+
inputs:
151+
version: 8.0.x
152+
148153
- task: AzureCLI@2
149154
displayName: Publish Using Darc
150155
inputs:

eng/common/core-templates/post-build/post-build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,11 @@ stages:
305305

306306
- task: NuGetAuthenticate@1
307307

308+
# Darc is targeting 8.0, so make sure it's installed
309+
- task: UseDotNet@2
310+
inputs:
311+
version: 8.0.x
312+
308313
- task: AzureCLI@2
309314
displayName: Publish Using Darc
310315
inputs:
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
diff -u -r a/usr/lib64/libc.so b/usr/lib64/libc.so
2+
--- a/usr/lib64/libc.so 2016-12-30 23:00:08.284951863 +0900
3+
+++ b/usr/lib64/libc.so 2016-12-30 23:00:32.140951815 +0900
4+
@@ -2,4 +2,4 @@
5+
Use the shared library, but some functions are only in
6+
the static library, so try that secondarily. */
7+
OUTPUT_FORMAT(elf64-x86-64)
8+
-GROUP ( /lib64/libc.so.6 /usr/lib64/libc_nonshared.a AS_NEEDED ( /lib64/ld-linux-x86-64.so.2 ) )
9+
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-x86-64.so.2 ) )
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
2+
--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900
3+
+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900
4+
@@ -2,4 +2,4 @@
5+
Use the shared library, but some functions are only in
6+
the static library, so try that secondarily. */
7+
OUTPUT_FORMAT(elf32-i386)
8+
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux.so.2 ) )
9+
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux.so.2 ) )

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
}
1717
},
1818
"msbuild-sdks": {
19-
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25515.2",
20-
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25515.2"
19+
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25555.4",
20+
"Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25555.4"
2121
}
2222
}

0 commit comments

Comments
 (0)