Update dependencies from https://github.com/dotnet/arcade build 20231110.1
Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.CMake.Sdk , Microsoft.DotNet.XliffTasks From Version 9.0.0-beta.23559.3 -> To Version 9.0.0-beta.23560.1
This commit is contained in:
parent
03b1532ebf
commit
5253b654b9
4 changed files with 15 additions and 11 deletions
|
@ -206,18 +206,18 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23559.3">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="9.0.0-beta.23560.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
|
||||
<Sha>576b0a6fca70266087aa247d68896376ecec8c6e</Sha>
|
||||
<SourceBuild RepoName="arcade" ManagedOnly="true" />
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.23559.3">
|
||||
<Dependency Name="Microsoft.DotNet.CMake.Sdk" Version="9.0.0-beta.23560.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
|
||||
<Sha>576b0a6fca70266087aa247d68896376ecec8c6e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23559.3">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="9.0.0-beta.23560.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
|
||||
<Sha>576b0a6fca70266087aa247d68896376ecec8c6e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.23551.2">
|
||||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
|
@ -227,9 +227,9 @@
|
|||
<Uri>https://github.com/dotnet/arcade-services</Uri>
|
||||
<Sha>88b0cbb096999d03068ddc9945465a3f5b6ba5da</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23559.3">
|
||||
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="9.0.0-beta.23560.1">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>a6513a141bc5cb0d7d625399918fcbca1dc8a412</Sha>
|
||||
<Sha>576b0a6fca70266087aa247d68896376ecec8c6e</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.Extensions.Logging.Console" Version="8.0.0-alpha.1.22557.12">
|
||||
<Uri>https://github.com/dotnet/runtime</Uri>
|
||||
|
|
|
@ -39,7 +39,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.23559.3</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>9.0.0-beta.23560.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade-services -->
|
||||
|
|
|
@ -288,6 +288,8 @@ elseif(TARGET_ARCH_NAME MATCHES "^(arm64|x64|riscv64)$")
|
|||
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64")
|
||||
add_toolchain_linker_flag("-Wl,--rpath-link=${CROSS_ROOTFS}/usr/lib64/gcc/${TIZEN_TOOLCHAIN}")
|
||||
endif()
|
||||
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
|
||||
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
|
||||
elseif(TARGET_ARCH_NAME STREQUAL "x86")
|
||||
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
|
||||
add_toolchain_linker_flag("--target=${TOOLCHAIN}")
|
||||
|
@ -335,6 +337,8 @@ if(TARGET_ARCH_NAME MATCHES "^(arm|armel)$")
|
|||
if(TARGET_ARCH_NAME STREQUAL "armel")
|
||||
add_compile_options(-mfloat-abi=softfp)
|
||||
endif()
|
||||
elseif(TARGET_ARCH_NAME STREQUAL "s390x")
|
||||
add_compile_options("--target=${TOOLCHAIN}")
|
||||
elseif(TARGET_ARCH_NAME STREQUAL "x86")
|
||||
if(EXISTS ${CROSS_ROOTFS}/usr/lib/gcc/i586-alpine-linux-musl)
|
||||
add_compile_options(--target=${TOOLCHAIN})
|
||||
|
|
|
@ -11,7 +11,7 @@
|
|||
"cmake": "3.21.0"
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23559.3",
|
||||
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23559.3"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23560.1",
|
||||
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.23560.1"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue