Skip to content

Commit 90d80b2

Browse files
author
v-wuzhai
authored
[release/8.0.4xx] Update dependencies from dotnet/arcade (#47523)
2 parents 3bb3874 + 874fee0 commit 90d80b2

File tree

5 files changed

+30
-12
lines changed

5 files changed

+30
-12
lines changed

‎NuGet.config

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
66
<!-- Begin: Package sources from dotnet-emsdk -->
77
<add key="darc-pub-dotnet-emsdk-ec84e77" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775/nuget/v3/index.json" />
8+
<add key="darc-pub-dotnet-emsdk-ec84e77-2" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775-2/nuget/v3/index.json" />
9+
<add key="darc-pub-dotnet-emsdk-ec84e77-1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-ec84e775-1/nuget/v3/index.json" />
810
<!-- End: Package sources from dotnet-emsdk -->
911
<!-- Begin: Package sources from dotnet-format -->
1012
<add key="darc-pub-dotnet-format-42ef1d0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-format-42ef1d04/nuget/v3/index.json" />
@@ -13,6 +15,8 @@
1315
<!-- End: Package sources from dotnet-format -->
1416
<!-- Begin: Package sources from dotnet-aspnetcore -->
1517
<add key="darc-int-dotnet-aspnetcore-25ef4aa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3/nuget/v3/index.json" />
18+
<add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-2/nuget/v3/index.json" />
19+
<add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-aspnetcore-25ef4aa3-1/nuget/v3/index.json" />
1620
<!-- End: Package sources from dotnet-aspnetcore -->
1721
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
1822
<add key="darc-pub-DotNet-msbuild-Trusted-2b19be4" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-DotNet-msbuild-Trusted-2b19be47/nuget/v3/index.json" />
@@ -21,12 +25,16 @@
2125
<!-- End: Package sources from dotnet-roslyn-analyzers -->
2226
<!-- Begin: Package sources from dotnet-runtime -->
2327
<add key="darc-int-dotnet-runtime-1584e49" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493/nuget/v3/index.json" />
28+
<add key="darc-int-dotnet-runtime-1584e49-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-2/nuget/v3/index.json" />
29+
<add key="darc-int-dotnet-runtime-1584e49-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493-1/nuget/v3/index.json" />
2430
<!-- End: Package sources from dotnet-runtime -->
2531
<!-- Begin: Package sources from dotnet-templating -->
2632
<add key="darc-pub-dotnet-templating-8e755bc" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-templating-8e755bc4/nuget/v3/index.json" />
2733
<!-- End: Package sources from dotnet-templating -->
2834
<!-- Begin: Package sources from dotnet-windowsdesktop -->
2935
<add key="darc-int-dotnet-windowsdesktop-8506c0d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8/nuget/v3/index.json" />
36+
<add key="darc-int-dotnet-windowsdesktop-8506c0d-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8-2/nuget/v3/index.json" />
37+
<add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-windowsdesktop-8506c0d8-1/nuget/v3/index.json" />
3038
<!-- End: Package sources from dotnet-windowsdesktop -->
3139
<!-- Begin: Package sources from dotnet-winforms -->
3240
<!-- End: Package sources from dotnet-winforms -->
@@ -53,14 +61,20 @@
5361
<!-- Begin: Package sources from dotnet-templating -->
5462
<!-- End: Package sources from dotnet-templating -->
5563
<!-- Begin: Package sources from dotnet-aspnetcore -->
64+
<add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="true" />
65+
<add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="true" />
5666
<add key="darc-int-dotnet-aspnetcore-25ef4aa" value="true" />
5767
<!-- Begin: Package sources from dotnet-format -->
5868
<!-- End: Package sources from dotnet-format -->
5969
<!-- End: Package sources from dotnet-aspnetcore -->
6070
<!-- Begin: Package sources from dotnet-runtime -->
71+
<add key="darc-int-dotnet-runtime-1584e49-1" value="true" />
72+
<add key="darc-int-dotnet-runtime-1584e49-2" value="true" />
6173
<add key="darc-int-dotnet-runtime-1584e49" value="true" />
6274
<!-- End: Package sources from dotnet-runtime -->
6375
<!-- Begin: Package sources from dotnet-windowsdesktop -->
76+
<add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="true" />
77+
<add key="darc-int-dotnet-windowsdesktop-8506c0d-2" value="true" />
6478
<add key="darc-int-dotnet-windowsdesktop-8506c0d" value="true" />
6579
<!-- Begin: Package sources from dotnet-winforms -->
6680
<!-- End: Package sources from dotnet-winforms -->

‎eng/Version.Details.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -491,22 +491,22 @@
491491
</Dependency>
492492
</ProductDependencies>
493493
<ToolsetDependencies>
494-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25114.5">
494+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25120.1">
495495
<Uri>https://github.com/dotnet/arcade</Uri>
496-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
496+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
497497
<SourceBuild RepoName="arcade" ManagedOnly="true" />
498498
</Dependency>
499-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25114.5">
499+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="8.0.0-beta.25120.1">
500500
<Uri>https://github.com/dotnet/arcade</Uri>
501-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
501+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
502502
</Dependency>
503-
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25114.5">
503+
<Dependency Name="Microsoft.DotNet.SignTool" Version="8.0.0-beta.25120.1">
504504
<Uri>https://github.com/dotnet/arcade</Uri>
505-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
505+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
506506
</Dependency>
507-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25114.5">
507+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="8.0.0-beta.25120.1">
508508
<Uri>https://github.com/dotnet/arcade</Uri>
509-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
509+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
510510
</Dependency>
511511
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1">
512512
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>

‎eng/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<SystemCollectionsImmutablePackageVersion>8.0.0</SystemCollectionsImmutablePackageVersion>
3737
<SystemDiagnosticsFileVersionInfoVersion>4.0.0</SystemDiagnosticsFileVersionInfoVersion>
3838
<SystemReflectionMetadataVersion>8.0.0</SystemReflectionMetadataVersion>
39-
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25114.5</MicrosoftDotNetSignToolVersion>
39+
<MicrosoftDotNetSignToolVersion>8.0.0-beta.25120.1</MicrosoftDotNetSignToolVersion>
4040
<MicrosoftWebXdtPackageVersion>7.0.0-preview.22423.2</MicrosoftWebXdtPackageVersion>
4141
<SystemSecurityCryptographyProtectedDataPackageVersion>8.0.0</SystemSecurityCryptographyProtectedDataPackageVersion>
4242
<SystemCollectionsSpecializedPackageVersion>4.3.0</SystemCollectionsSpecializedPackageVersion>
@@ -213,7 +213,7 @@
213213
<PropertyGroup>
214214
<FluentAssertionsVersion>6.12.0</FluentAssertionsVersion>
215215
<FluentAssertionsJsonVersion>6.1.0</FluentAssertionsJsonVersion>
216-
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25114.5</MicrosoftDotNetXUnitExtensionsVersion>
216+
<MicrosoftDotNetXUnitExtensionsVersion>8.0.0-beta.25120.1</MicrosoftDotNetXUnitExtensionsVersion>
217217
<MoqPackageVersion>4.18.4</MoqPackageVersion>
218218
<XunitCombinatorialVersion>1.3.2</XunitCombinatorialVersion>
219219
<MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>8.0.0-beta.23607.1</MicrosoftDotNetInstallerWindowsSecurityTestDataPackageVersion>

‎eng/common/cross/toolchain.cmake

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64)$")
280280
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
281281
add_toolchain_linker_flag("-Wl,--rpath-link=${TIZEN_TOOLCHAIN_PATH}")
282282
endif()
283+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
284+
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
283285
elseif(TARGET_ARCH_NAME STREQUAL "x86")
284286
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
285287
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
@@ -327,6 +329,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
327329
if(TARGET_ARCH_NAME STREQUAL "armel")
328330
add_compile_options(-mfloat-abi=softfp)
329331
endif()
332+
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
333+
add_compile_options("--target=${TOOLCHAIN}")
330334
elseif(TARGET_ARCH_NAME STREQUAL "x86")
331335
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
332336
add_compile_options(--target=${TOOLCHAIN})

‎global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
}
1515
},
1616
"msbuild-sdks": {
17-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25114.5",
18-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25114.5"
17+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1",
18+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25120.1"
1919
}
2020
}

0 commit comments

Comments
 (0)