Skip to content

Commit db415c7

Browse files
v-wuzhaiv-wuzhai
authored
[release/8.0.4xx] Update dependencies from dotnet/arcade (#20365)
2 parents 78757c8 + 67265e9 commit db415c7

File tree

5 files changed

+31
-9
lines changed

5 files changed

+31
-9
lines changed

‎NuGet.config

+18
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,31 @@
88
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
99
<!-- Begin: Package sources from dotnet-emsdk -->
1010
<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" />
11+
<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" />
12+
<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" />
1113
<!-- End: Package sources from dotnet-emsdk -->
1214
<!-- Begin: Package sources from dotnet-aspnetcore -->
1315
<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" />
16+
<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" />
17+
<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" />
1418
<!-- End: Package sources from dotnet-aspnetcore -->
1519
<!-- Begin: Package sources from dotnet-windowsdesktop -->
1620
<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" />
21+
<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" />
22+
<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" />
1723
<!-- End: Package sources from dotnet-windowsdesktop -->
1824
<!-- Begin: Package sources from DotNet-msbuild-Trusted -->
1925
<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" />
2026
<!-- End: Package sources from DotNet-msbuild-Trusted -->
2127
<!-- Begin: Package sources from dotnet-runtime -->
2228
<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" />
29+
<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" />
30+
<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" />
2331
<!-- End: Package sources from dotnet-runtime -->
2432
<!-- Begin: Package sources from dotnet-sdk -->
2533
<add key="darc-int-dotnet-sdk-5840ed0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5840ed02/nuget/v3/index.json" />
34+
<add key="darc-int-dotnet-sdk-5840ed0-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5840ed02-2/nuget/v3/index.json" />
35+
<add key="darc-int-dotnet-sdk-5840ed0-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-sdk-5840ed02-1/nuget/v3/index.json" />
2636
<!-- End: Package sources from dotnet-sdk -->
2737
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2838
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
@@ -41,15 +51,23 @@
4151
<disabledPackageSources>
4252
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
4353
<!-- Begin: Package sources from dotnet-aspnetcore -->
54+
<add key="darc-int-dotnet-aspnetcore-25ef4aa-1" value="true" />
55+
<add key="darc-int-dotnet-aspnetcore-25ef4aa-2" value="true" />
4456
<add key="darc-int-dotnet-aspnetcore-25ef4aa" value="true" />
4557
<!-- End: Package sources from dotnet-aspnetcore -->
4658
<!-- Begin: Package sources from dotnet-runtime -->
59+
<add key="darc-int-dotnet-runtime-1584e49-1" value="true" />
60+
<add key="darc-int-dotnet-runtime-1584e49-2" value="true" />
4761
<add key="darc-int-dotnet-runtime-1584e49" value="true" />
4862
<!-- End: Package sources from dotnet-runtime -->
4963
<!-- Begin: Package sources from dotnet-sdk -->
64+
<add key="darc-int-dotnet-sdk-5840ed0-1" value="true" />
65+
<add key="darc-int-dotnet-sdk-5840ed0-2" value="true" />
5066
<add key="darc-int-dotnet-sdk-5840ed0" value="true" />
5167
<!-- End: Package sources from dotnet-sdk -->
5268
<!-- Begin: Package sources from dotnet-windowsdesktop -->
69+
<add key="darc-int-dotnet-windowsdesktop-8506c0d-1" value="true" />
70+
<add key="darc-int-dotnet-windowsdesktop-8506c0d-2" value="true" />
5371
<add key="darc-int-dotnet-windowsdesktop-8506c0d" value="true" />
5472
<!-- End: Package sources from dotnet-windowsdesktop -->
5573
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->

‎eng/Version.Details.xml

+6-6
Original file line numberDiff line numberDiff line change
@@ -214,18 +214,18 @@
214214
</Dependency>
215215
</ProductDependencies>
216216
<ToolsetDependencies>
217-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25114.5">
217+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="8.0.0-beta.25120.1">
218218
<Uri>https://github.com/dotnet/arcade</Uri>
219-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
219+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
220220
<SourceBuild RepoName="arcade" ManagedOnly="true" />
221221
</Dependency>
222-
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25114.5">
222+
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="8.0.0-beta.25120.1">
223223
<Uri>https://github.com/dotnet/arcade</Uri>
224-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
224+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
225225
</Dependency>
226-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25114.5">
226+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="8.0.0-beta.25120.1">
227227
<Uri>https://github.com/dotnet/arcade</Uri>
228-
<Sha>221fba21fbd6a29f17af7a7004f8ef18a51519bd</Sha>
228+
<Sha>4ff4ce248e95ae74b0040de6a6c5939aa63120dc</Sha>
229229
</Dependency>
230230
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24306.1">
231231
<Uri>https://github.com/dotnet/arcade-services</Uri>

‎eng/Versions.props

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
</PropertyGroup>
4040
<PropertyGroup>
4141
<!-- Dependency from https://github.com/dotnet/arcade -->
42-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25114.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
42+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>8.0.0-beta.25120.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
4343
</PropertyGroup>
4444
<PropertyGroup>
4545
<!-- Dependency from https://github.com/dotnet/arcade-services -->

‎eng/common/cross/toolchain.cmake

+4
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

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"cmake": "3.21.0"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25114.5",
15-
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25114.5"
14+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25120.1",
15+
"Microsoft.DotNet.CMake.Sdk": "8.0.0-beta.25120.1"
1616
}
1717
}

0 commit comments

Comments
 (0)