Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
wpf
提交
964b7ef4
W
wpf
项目概览
dotNET Platform
/
wpf
12 个月 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
W
wpf
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
964b7ef4
编写于
12月 24, 2021
作者:
D
dotnet-maestro[bot]
提交者:
GitHub
12月 24, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update dependencies from
https://github.com/dotnet/arcade
build 20211223.2 (#5875)
[main] Update dependencies from dotnet/arcade
上级
e83db97a
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
240 addition
and
19 deletion
+240
-19
eng/Version.Details.xml
eng/Version.Details.xml
+10
-10
eng/Versions.props
eng/Versions.props
+3
-3
eng/common/cross/arm/tizen-build-rootfs.sh
eng/common/cross/arm/tizen-build-rootfs.sh
+35
-0
eng/common/cross/arm/tizen-fetch.sh
eng/common/cross/arm/tizen-fetch.sh
+170
-0
eng/common/cross/arm/tizen/tizen.patch
eng/common/cross/arm/tizen/tizen.patch
+9
-0
eng/common/cross/build-rootfs.sh
eng/common/cross/build-rootfs.sh
+2
-2
eng/common/cross/toolchain.cmake
eng/common/cross/toolchain.cmake
+9
-2
global.json
global.json
+2
-2
未找到文件。
eng/Version.Details.xml
浏览文件 @
964b7ef4
...
...
@@ -75,25 +75,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"7.0.0-beta.21623.
1
"
>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"7.0.0-beta.21623.
2
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
4abaab2bf44d06638abeb23fc96c4f6eef58a2f0
</Sha>
<Sha>
1a66526b0c1eb068cab89909b7d52fe6f57d64df
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.CodeAnalysis"
Version=
"7.0.0-beta.21623.
1
"
>
<Dependency
Name=
"Microsoft.DotNet.CodeAnalysis"
Version=
"7.0.0-beta.21623.
2
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
4abaab2bf44d06638abeb23fc96c4f6eef58a2f0
</Sha>
<Sha>
1a66526b0c1eb068cab89909b7d52fe6f57d64df
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.Helix.Sdk"
Version=
"7.0.0-beta.21623.
1
"
>
<Dependency
Name=
"Microsoft.DotNet.Helix.Sdk"
Version=
"7.0.0-beta.21623.
2
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
4abaab2bf44d06638abeb23fc96c4f6eef58a2f0
</Sha>
<Sha>
1a66526b0c1eb068cab89909b7d52fe6f57d64df
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.ApiCompat"
Version=
"7.0.0-beta.21623.
1
"
>
<Dependency
Name=
"Microsoft.DotNet.ApiCompat"
Version=
"7.0.0-beta.21623.
2
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
4abaab2bf44d06638abeb23fc96c4f6eef58a2f0
</Sha>
<Sha>
1a66526b0c1eb068cab89909b7d52fe6f57d64df
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.GenAPI"
Version=
"7.0.0-beta.21623.
1
"
>
<Dependency
Name=
"Microsoft.DotNet.GenAPI"
Version=
"7.0.0-beta.21623.
2
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
4abaab2bf44d06638abeb23fc96c4f6eef58a2f0
</Sha>
<Sha>
1a66526b0c1eb068cab89909b7d52fe6f57d64df
</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
eng/Versions.props
浏览文件 @
964b7ef4
...
...
@@ -37,9 +37,9 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>
7.0.0-beta.21623.
1
</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>
7.0.0-beta.21623.
1
</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>
7.0.0-beta.21623.
1
</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>
7.0.0-beta.21623.
2
</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>
7.0.0-beta.21623.
2
</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>
7.0.0-beta.21623.
2
</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Maintain System.CodeDom PackageVersion at 4.4.0. See https://github.com/Microsoft/msbuild/issues/3627 -->
<!-- Pin specific versions of S.Memory so that it would supply AssemblyVersion=4.0.1.0. See https://github.com/dotnet/runtime/issues/31672 -->
...
...
eng/common/cross/arm/tizen-build-rootfs.sh
0 → 100644
浏览文件 @
964b7ef4
#!/usr/bin/env bash
set
-e
__ARM_HARDFP_CrossDir
=
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&&
pwd
)
__TIZEN_CROSSDIR
=
"
$__ARM_HARDFP_CrossDir
/tizen"
if
[[
-z
"
$ROOTFS_DIR
"
]]
;
then
echo
"ROOTFS_DIR is not defined."
exit
1
;
fi
TIZEN_TMP_DIR
=
$ROOTFS_DIR
/tizen_tmp
mkdir
-p
$TIZEN_TMP_DIR
# Download files
echo
">>Start downloading files"
VERBOSE
=
1
$__ARM_HARDFP_CrossDir
/tizen-fetch.sh
$TIZEN_TMP_DIR
echo
"<<Finish downloading files"
echo
">>Start constructing Tizen rootfs"
TIZEN_RPM_FILES
=
`
ls
$TIZEN_TMP_DIR
/
*
.rpm
`
cd
$ROOTFS_DIR
for
f
in
$TIZEN_RPM_FILES
;
do
rpm2cpio
$f
| cpio
-idm
--quiet
done
echo
"<<Finish constructing Tizen rootfs"
# Cleanup tmp
rm
-rf
$TIZEN_TMP_DIR
# Configure Tizen rootfs
echo
">>Start configuring Tizen rootfs"
ln
-sfn
asm-arm ./usr/include/asm
patch
-p1
<
$__TIZEN_CROSSDIR
/tizen.patch
echo
"<<Finish configuring Tizen rootfs"
eng/common/cross/arm/tizen-fetch.sh
0 → 100644
浏览文件 @
964b7ef4
#!/usr/bin/env bash
set
-e
if
[[
-z
"
${
VERBOSE
//
}
"
]]
||
[
"
$VERBOSE
"
-ne
"
$VERBOSE
"
]
2>/dev/null
;
then
VERBOSE
=
0
fi
Log
()
{
if
[
$VERBOSE
-ge
$1
]
;
then
echo
${
@
:2
}
fi
}
Inform
()
{
Log 1
-e
"
\x
1B[0;34m
$@
\x
1B[m"
}
Debug
()
{
Log 2
-e
"
\x
1B[0;32m
$@
\x
1B[m"
}
Error
()
{
>
&2 Log 0
-e
"
\x
1B[0;31m
$@
\x
1B[m"
}
Fetch
()
{
URL
=
$1
FILE
=
$2
PROGRESS
=
$3
if
[
$VERBOSE
-ge
1
]
&&
[
$PROGRESS
]
;
then
CURL_OPT
=
"--progress-bar"
else
CURL_OPT
=
"--silent"
fi
curl
$CURL_OPT
$URL
>
$FILE
}
hash
curl 2> /dev/null
||
{
Error
"Require 'curl' Aborting."
;
exit
1
;
}
hash
xmllint 2> /dev/null
||
{
Error
"Require 'xmllint' Aborting."
;
exit
1
;
}
hash sha256sum
2> /dev/null
||
{
Error
"Require 'sha256sum' Aborting."
;
exit
1
;
}
TMPDIR
=
$1
if
[
!
-d
$TMPDIR
]
;
then
TMPDIR
=
./tizen_tmp
Debug
"Create temporary directory :
$TMPDIR
"
mkdir
-p
$TMPDIR
fi
TIZEN_URL
=
http://download.tizen.org/snapshots/tizen
BUILD_XML
=
build.xml
REPOMD_XML
=
repomd.xml
PRIMARY_XML
=
primary.xml
TARGET_URL
=
"http://__not_initialized"
Xpath_get
()
{
XPATH_RESULT
=
''
XPATH
=
$1
XML_FILE
=
$2
RESULT
=
$(
xmllint
--xpath
$XPATH
$XML_FILE
)
if
[[
-z
${
RESULT
//
}
]]
;
then
Error
"Can not find target from
$XML_FILE
"
Debug
"Xpath =
$XPATH
"
exit
1
fi
XPATH_RESULT
=
$RESULT
}
fetch_tizen_pkgs_init
()
{
TARGET
=
$1
PROFILE
=
$2
Debug
"Initialize TARGET=
$TARGET
, PROFILE=
$PROFILE
"
TMP_PKG_DIR
=
$TMPDIR
/tizen_
${
PROFILE
}
_pkgs
if
[
-d
$TMP_PKG_DIR
]
;
then
rm
-rf
$TMP_PKG_DIR
;
fi
mkdir
-p
$TMP_PKG_DIR
PKG_URL
=
$TIZEN_URL
/
$PROFILE
/latest
BUILD_XML_URL
=
$PKG_URL
/
$BUILD_XML
TMP_BUILD
=
$TMP_PKG_DIR
/
$BUILD_XML
TMP_REPOMD
=
$TMP_PKG_DIR
/
$REPOMD_XML
TMP_PRIMARY
=
$TMP_PKG_DIR
/
$PRIMARY_XML
TMP_PRIMARYGZ
=
${
TMP_PRIMARY
}
.gz
Fetch
$BUILD_XML_URL
$TMP_BUILD
Debug
"fetch
$BUILD_XML_URL
to
$TMP_BUILD
"
TARGET_XPATH
=
"//build/buildtargets/buildtarget[@name=
\"
$TARGET
\"
]/repo[@type=
\"
binary
\"
]/text()"
Xpath_get
$TARGET_XPATH
$TMP_BUILD
TARGET_PATH
=
$XPATH_RESULT
TARGET_URL
=
$PKG_URL
/
$TARGET_PATH
REPOMD_URL
=
$TARGET_URL
/repodata/repomd.xml
PRIMARY_XPATH
=
'string(//*[local-name()="data"][@type="primary"]/*[local-name()="location"]/@href)'
Fetch
$REPOMD_URL
$TMP_REPOMD
Debug
"fetch
$REPOMD_URL
to
$TMP_REPOMD
"
Xpath_get
$PRIMARY_XPATH
$TMP_REPOMD
PRIMARY_XML_PATH
=
$XPATH_RESULT
PRIMARY_URL
=
$TARGET_URL
/
$PRIMARY_XML_PATH
Fetch
$PRIMARY_URL
$TMP_PRIMARYGZ
Debug
"fetch
$PRIMARY_URL
to
$TMP_PRIMARYGZ
"
gunzip
$TMP_PRIMARYGZ
Debug
"unzip
$TMP_PRIMARYGZ
to
$TMP_PRIMARY
"
}
fetch_tizen_pkgs
()
{
ARCH
=
$1
PACKAGE_XPATH_TPL
=
'string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="location"]/@href)'
PACKAGE_CHECKSUM_XPATH_TPL
=
'string(//*[local-name()="metadata"]/*[local-name()="package"][*[local-name()="name"][text()="_PKG_"]][*[local-name()="arch"][text()="_ARCH_"]]/*[local-name()="checksum"]/text())'
for
pkg
in
${
@
:2
}
do
Inform
"Fetching...
$pkg
"
XPATH
=
${
PACKAGE_XPATH_TPL
/_PKG_/
$pkg
}
XPATH
=
${
XPATH
/_ARCH_/
$ARCH
}
Xpath_get
$XPATH
$TMP_PRIMARY
PKG_PATH
=
$XPATH_RESULT
XPATH
=
${
PACKAGE_CHECKSUM_XPATH_TPL
/_PKG_/
$pkg
}
XPATH
=
${
XPATH
/_ARCH_/
$ARCH
}
Xpath_get
$XPATH
$TMP_PRIMARY
CHECKSUM
=
$XPATH_RESULT
PKG_URL
=
$TARGET_URL
/
$PKG_PATH
PKG_FILE
=
$(
basename
$PKG_PATH
)
PKG_PATH
=
$TMPDIR
/
$PKG_FILE
Debug
"Download
$PKG_URL
to
$PKG_PATH
"
Fetch
$PKG_URL
$PKG_PATH
true
echo
"
$CHECKSUM
$PKG_PATH
"
|
sha256sum
-c
-
>
/dev/null
if
[
$?
-ne
0
]
;
then
Error
"Fail to fetch
$PKG_URL
to
$PKG_PATH
"
Debug
"Checksum =
$CHECKSUM
"
exit
1
fi
done
}
Inform
"Initialize arm base"
fetch_tizen_pkgs_init standard base
Inform
"fetch common packages"
fetch_tizen_pkgs armv7hl gcc gcc-devel-static glibc glibc-devel libicu libicu-devel libatomic linux-glibc-devel keyutils keyutils-devel libkeyutils
Inform
"fetch coreclr packages"
fetch_tizen_pkgs armv7hl lldb lldb-devel libgcc libstdc++ libstdc++-devel libunwind libunwind-devel lttng-ust-devel lttng-ust userspace-rcu-devel userspace-rcu
Inform
"fetch corefx packages"
fetch_tizen_pkgs armv7hl libcom_err libcom_err-devel zlib zlib-devel libopenssl11 libopenssl1.1-devel krb5 krb5-devel
Inform
"Initialize standard unified"
fetch_tizen_pkgs_init standard unified
Inform
"fetch corefx packages"
fetch_tizen_pkgs armv7hl gssdp gssdp-devel tizen-release
eng/common/cross/arm/tizen/tizen.patch
0 → 100644
浏览文件 @
964b7ef4
diff -u -r a/usr/lib/libc.so b/usr/lib/libc.so
--- a/usr/lib/libc.so 2016-12-30 23:00:08.284951863 +0900
+++ b/usr/lib/libc.so 2016-12-30 23:00:32.140951815 +0900
@@ -2,4 +2,4 @@
Use the shared library, but some functions are only in
the static library, so try that secondarily. */
OUTPUT_FORMAT(elf32-littlearm)
-GROUP ( /lib/libc.so.6 /usr/lib/libc_nonshared.a AS_NEEDED ( /lib/ld-linux-armhf.so.3 ) )
+GROUP ( libc.so.6 libc_nonshared.a AS_NEEDED ( ld-linux-armhf.so.3 ) )
eng/common/cross/build-rootfs.sh
浏览文件 @
964b7ef4
...
...
@@ -185,8 +185,8 @@ while :; do
__LLDB_Package
=
"liblldb-6.0-dev"
;;
tizen
)
if
[
"
$__BuildArch
"
!=
"armel"
]
&&
[
"
$__BuildArch
"
!=
"arm64"
]
;
then
echo
"Tizen is available only for armel and arm64."
if
[
"
$__BuildArch
"
!=
"arm
"
]
&&
[
"
$__BuildArch
"
!=
"arm
el"
]
&&
[
"
$__BuildArch
"
!=
"arm64"
]
;
then
echo
"Tizen is available only for arm
, arm
el and arm64."
usage
;
exit
1
;
fi
...
...
eng/common/cross/toolchain.cmake
浏览文件 @
964b7ef4
...
...
@@ -26,6 +26,9 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm")
else
()
set
(
TOOLCHAIN
"arm-linux-gnueabihf"
)
endif
()
if
(
"$ENV{__DistroRid}"
MATCHES
"tizen.*"
)
set
(
TIZEN_TOOLCHAIN
"armv7hl-tizen-linux-gnueabihf/9.2.0"
)
endif
()
elseif
(
TARGET_ARCH_NAME STREQUAL
"arm64"
)
set
(
CMAKE_SYSTEM_PROCESSOR aarch64
)
if
(
EXISTS
${
CROSS_ROOTFS
}
/usr/lib/gcc/aarch64-alpine-linux-musl
)
...
...
@@ -58,6 +61,10 @@ endif()
# Specify include paths
if
(
DEFINED TIZEN_TOOLCHAIN
)
if
(
TARGET_ARCH_NAME STREQUAL
"arm"
)
include_directories
(
SYSTEM
${
CROSS_ROOTFS
}
/usr/lib/gcc/
${
TIZEN_TOOLCHAIN
}
/include/c++/
)
include_directories
(
SYSTEM
${
CROSS_ROOTFS
}
/usr/lib/gcc/
${
TIZEN_TOOLCHAIN
}
/include/c++/armv7hl-tizen-linux-gnueabihf
)
endif
()
if
(
TARGET_ARCH_NAME STREQUAL
"armel"
)
include_directories
(
SYSTEM
${
CROSS_ROOTFS
}
/usr/lib/gcc/
${
TIZEN_TOOLCHAIN
}
/include/c++/
)
include_directories
(
SYSTEM
${
CROSS_ROOTFS
}
/usr/lib/gcc/
${
TIZEN_TOOLCHAIN
}
/include/c++/armv7l-tizen-linux-gnueabi
)
...
...
@@ -150,7 +157,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
add_toolchain_linker_flag
(
"-Wl,--rpath-link=
${
CROSS_ROOTFS
}
/usr/lib/
${
TOOLCHAIN
}
"
)
endif
()
if
(
TARGET_ARCH_NAME STREQUAL
"armel"
)
if
(
TARGET_ARCH_NAME STREQUAL
"arm
"
OR TARGET_ARCH_NAME STREQUAL
"arm
el"
)
if
(
DEFINED TIZEN_TOOLCHAIN
)
# For Tizen only
add_toolchain_linker_flag
(
"-B
${
CROSS_ROOTFS
}
/usr/lib/gcc/
${
TIZEN_TOOLCHAIN
}
"
)
add_toolchain_linker_flag
(
"-L
${
CROSS_ROOTFS
}
/lib"
)
...
...
@@ -205,7 +212,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
endif
()
if
(
DEFINED TIZEN_TOOLCHAIN
)
if
(
TARGET_ARCH_NAME MATCHES
"^(armel|arm64)$"
)
if
(
TARGET_ARCH_NAME MATCHES
"^(arm
|arm
el|arm64)$"
)
add_compile_options
(
-Wno-deprecated-declarations
)
# compile-time option
add_compile_options
(
-D__extern_always_inline=inline
)
# compile-time option
endif
()
...
...
global.json
浏览文件 @
964b7ef4
...
...
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks"
:
{
"Microsoft.DotNet.Arcade.Sdk"
:
"7.0.0-beta.21623.
1
"
,
"Microsoft.DotNet.Helix.Sdk"
:
"7.0.0-beta.21623.
1
"
"Microsoft.DotNet.Arcade.Sdk"
:
"7.0.0-beta.21623.
2
"
,
"Microsoft.DotNet.Helix.Sdk"
:
"7.0.0-beta.21623.
2
"
},
"sdk"
:
{
"version"
:
"6.0.100"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录