Skip to content

Commit 7f948a5

Browse files
author
v-wuzhai
authored
[main] Update dependencies from dotnet/arcade (#48614)
2 parents 5935e12 + 18862a9 commit 7f948a5

File tree

5 files changed

+29
-34
lines changed

5 files changed

+29
-34
lines changed

‎eng/Version.Details.xml

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -631,42 +631,42 @@
631631
</Dependency>
632632
</ProductDependencies>
633633
<ToolsetDependencies>
634-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25217.1">
634+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25221.2">
635635
<Uri>https://github.com/dotnet/arcade</Uri>
636-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
636+
<Sha>f68e9e905ba5a7b6437b7560d5a6b170057ecb2f</Sha>
637637
</Dependency>
638-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25217.1">
638+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.25221.2">
639639
<Uri>https://github.com/dotnet/arcade</Uri>
640-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
640+
<Sha>f68e9e905ba5a7b6437b7560d5a6b170057ecb2f</Sha>
641641
</Dependency>
642-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25217.1">
642+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25221.2">
643643
<Uri>https://github.com/dotnet/arcade</Uri>
644-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
644+
<Sha>f68e9e905ba5a7b6437b7560d5a6b170057ecb2f</Sha>
645645
</Dependency>
646-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25217.1">
646+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Workloads" Version="10.0.0-beta.25221.2">
647647
<Uri>https://github.com/dotnet/arcade</Uri>
648-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
648+
<Sha>f68e9e905ba5a7b6437b7560d5a6b170057ecb2f</Sha>
649649
</Dependency>
650-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25217.1">
650+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25221.2">
651651
<Uri>https://github.com/dotnet/arcade</Uri>
652-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
652+
<Sha>f68e9e905ba5a7b6437b7560d5a6b170057ecb2f</Sha>
653653
</Dependency>
654-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25217.1">
654+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.25221.2">
655655
<Uri>https://github.com/dotnet/arcade</Uri>
656-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
656+
<Sha>f68e9e905ba5a7b6437b7560d5a6b170057ecb2f</Sha>
657657
</Dependency>
658-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25217.1">
658+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.25221.2">
659659
<Uri>https://github.com/dotnet/arcade</Uri>
660-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
660+
<Sha>f68e9e905ba5a7b6437b7560d5a6b170057ecb2f</Sha>
661661
</Dependency>
662-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25217.1">
662+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.25221.2">
663663
<Uri>https://github.com/dotnet/arcade</Uri>
664-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
664+
<Sha>f68e9e905ba5a7b6437b7560d5a6b170057ecb2f</Sha>
665665
</Dependency>
666666
<!-- Intermediate is necessary for source build. -->
667-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25217.1">
667+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.25221.2">
668668
<Uri>https://github.com/dotnet/arcade</Uri>
669-
<Sha>76dd1b4eb3b15881da350de93805ea6ab936364c</Sha>
669+
<Sha>f68e9e905ba5a7b6437b7560d5a6b170057ecb2f</Sha>
670670
<SourceBuild RepoName="arcade" ManagedOnly="true" />
671671
</Dependency>
672672
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-preview.4.25217.10">

‎eng/Versions.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -282,12 +282,12 @@
282282
</PropertyGroup>
283283
<PropertyGroup>
284284
<!-- Dependencies from https://github.com/dotnet/arcade -->
285-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25217.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
286-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25217.1</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
287-
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25217.1</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
288-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25217.1</MicrosoftDotNetSignToolVersion>
289-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25217.1</MicrosoftDotNetXliffTasksVersion>
290-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25217.1</MicrosoftDotNetXUnitExtensionsVersion>
285+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.25221.2</MicrosoftDotNetBuildTasksInstallersPackageVersion>
286+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>10.0.0-beta.25221.2</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
287+
<MicrosoftDotNetBuildTasksWorkloadsPackageVersion>10.0.0-beta.25221.2</MicrosoftDotNetBuildTasksWorkloadsPackageVersion>
288+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.25221.2</MicrosoftDotNetSignToolVersion>
289+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.25221.2</MicrosoftDotNetXliffTasksVersion>
290+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.25221.2</MicrosoftDotNetXUnitExtensionsVersion>
291291
</PropertyGroup>
292292
<PropertyGroup>
293293
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25217.1",
18-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25217.1",
17+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25221.2",
18+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25221.2",
1919
"Microsoft.Build.NoTargets": "3.7.0",
2020
"Microsoft.Build.Traversal": "3.4.0"
2121
}

0 commit comments

Comments
 (0)