Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
wpf
提交
d629584b
W
wpf
项目概览
dotNET Platform
/
wpf
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
未验证
提交
d629584b
编写于
12月 28, 2021
作者:
D
dotnet-maestro[bot]
提交者:
GitHub
12月 28, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update dependencies from
https://github.com/dotnet/arcade
build 20211227.1 (#5881)
[main] Update dependencies from dotnet/arcade
上级
62129e57
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
65 addition
and
35 deletion
+65
-35
eng/Version.Details.xml
eng/Version.Details.xml
+10
-10
eng/Versions.props
eng/Versions.props
+3
-3
eng/common/cross/toolchain.cmake
eng/common/cross/toolchain.cmake
+24
-14
eng/common/native/init-compiler.sh
eng/common/native/init-compiler.sh
+26
-6
global.json
global.json
+2
-2
未找到文件。
eng/Version.Details.xml
浏览文件 @
d629584b
...
...
@@ -75,25 +75,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"7.0.0-beta.2162
3.2
"
>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"7.0.0-beta.2162
7.1
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1a66526b0c1eb068cab89909b7d52fe6f57d64df
</Sha>
<Sha>
28ea474e02753fe23295f60e8792bc845b8b6e20
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.CodeAnalysis"
Version=
"7.0.0-beta.2162
3.2
"
>
<Dependency
Name=
"Microsoft.DotNet.CodeAnalysis"
Version=
"7.0.0-beta.2162
7.1
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1a66526b0c1eb068cab89909b7d52fe6f57d64df
</Sha>
<Sha>
28ea474e02753fe23295f60e8792bc845b8b6e20
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.Helix.Sdk"
Version=
"7.0.0-beta.2162
3.2
"
>
<Dependency
Name=
"Microsoft.DotNet.Helix.Sdk"
Version=
"7.0.0-beta.2162
7.1
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1a66526b0c1eb068cab89909b7d52fe6f57d64df
</Sha>
<Sha>
28ea474e02753fe23295f60e8792bc845b8b6e20
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.ApiCompat"
Version=
"7.0.0-beta.2162
3.2
"
>
<Dependency
Name=
"Microsoft.DotNet.ApiCompat"
Version=
"7.0.0-beta.2162
7.1
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1a66526b0c1eb068cab89909b7d52fe6f57d64df
</Sha>
<Sha>
28ea474e02753fe23295f60e8792bc845b8b6e20
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.GenAPI"
Version=
"7.0.0-beta.2162
3.2
"
>
<Dependency
Name=
"Microsoft.DotNet.GenAPI"
Version=
"7.0.0-beta.2162
7.1
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1a66526b0c1eb068cab89909b7d52fe6f57d64df
</Sha>
<Sha>
28ea474e02753fe23295f60e8792bc845b8b6e20
</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
eng/Versions.props
浏览文件 @
d629584b
...
...
@@ -37,9 +37,9 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>
7.0.0-beta.2162
3.2
</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>
7.0.0-beta.2162
3.2
</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>
7.0.0-beta.2162
3.2
</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>
7.0.0-beta.2162
7.1
</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>
7.0.0-beta.2162
7.1
</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>
7.0.0-beta.2162
7.1
</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/toolchain.cmake
浏览文件 @
d629584b
...
...
@@ -3,18 +3,26 @@ set(CROSS_ROOTFS $ENV{ROOTFS_DIR})
set
(
TARGET_ARCH_NAME $ENV{TARGET_BUILD_ARCH}
)
if
(
EXISTS
${
CROSS_ROOTFS
}
/bin/freebsd-version
)
set
(
CMAKE_SYSTEM_NAME FreeBSD
)
set
(
FREEBSD 1
)
elseif
(
EXISTS
${
CROSS_ROOTFS
}
/usr/platform/i86pc
)
set
(
CMAKE_SYSTEM_NAME SunOS
)
set
(
ILLUMOS 1
)
else
()
set
(
CMAKE_SYSTEM_NAME Linux
)
set
(
LINUX 1
)
endif
()
set
(
CMAKE_SYSTEM_VERSION 1
)
if
(
EXISTS
${
CROSS_ROOTFS
}
/etc/tizen-release
)
set
(
TIZEN 1
)
elseif
(
EXISTS
${
CROSS_ROOTFS
}
/android_platform
)
set
(
ANDROID 1
)
endif
()
if
(
TARGET_ARCH_NAME STREQUAL
"armel"
)
set
(
CMAKE_SYSTEM_PROCESSOR armv7l
)
set
(
TOOLCHAIN
"arm-linux-gnueabi"
)
if
(
"$ENV{__DistroRid}"
MATCHES
"tizen.*"
)
if
(
TIZEN
)
set
(
TIZEN_TOOLCHAIN
"armv7l-tizen-linux-gnueabi/9.2.0"
)
endif
()
elseif
(
TARGET_ARCH_NAME STREQUAL
"arm"
)
...
...
@@ -26,7 +34,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm")
else
()
set
(
TOOLCHAIN
"arm-linux-gnueabihf"
)
endif
()
if
(
"$ENV{__DistroRid}"
MATCHES
"tizen.*"
)
if
(
TIZEN
)
set
(
TIZEN_TOOLCHAIN
"armv7hl-tizen-linux-gnueabihf/9.2.0"
)
endif
()
elseif
(
TARGET_ARCH_NAME STREQUAL
"arm64"
)
...
...
@@ -36,7 +44,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "arm64")
else
()
set
(
TOOLCHAIN
"aarch64-linux-gnu"
)
endif
()
if
(
"$ENV{__DistroRid}"
MATCHES
"tizen.*"
)
if
(
TIZEN
)
set
(
TIZEN_TOOLCHAIN
"aarch64-tizen-linux-gnu/9.2.0"
)
endif
()
elseif
(
TARGET_ARCH_NAME STREQUAL
"s390x"
)
...
...
@@ -45,7 +53,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "s390x")
elseif
(
TARGET_ARCH_NAME STREQUAL
"x86"
)
set
(
CMAKE_SYSTEM_PROCESSOR i686
)
set
(
TOOLCHAIN
"i686-linux-gnu"
)
elseif
(
CMAKE_SYSTEM_NAME STREQUAL
"FreeBSD"
)
elseif
(
FREEBSD
)
set
(
CMAKE_SYSTEM_PROCESSOR
"x86_64"
)
set
(
triple
"x86_64-unknown-freebsd12"
)
elseif
(
ILLUMOS
)
...
...
@@ -60,7 +68,7 @@ if(DEFINED ENV{TOOLCHAIN})
endif
()
# Specify include paths
if
(
DEFINED TIZEN_TOOLCHAI
N
)
if
(
TIZE
N
)
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
)
...
...
@@ -75,7 +83,7 @@ if(DEFINED TIZEN_TOOLCHAIN)
endif
()
endif
()
if
(
"$ENV{__DistroRid}"
MATCHES
"android.*"
)
if
(
ANDROID
)
if
(
TARGET_ARCH_NAME STREQUAL
"arm"
)
set
(
ANDROID_ABI armeabi-v7a
)
elseif
(
TARGET_ARCH_NAME STREQUAL
"arm64"
)
...
...
@@ -83,7 +91,9 @@ if("$ENV{__DistroRid}" MATCHES "android.*")
endif
()
# extract platform number required by the NDK's toolchain
string
(
REGEX REPLACE
".*
\\
.([0-9]+)-.*"
"
\\
1"
ANDROID_PLATFORM
"$ENV{__DistroRid}"
)
file
(
READ
"
${
CROSS_ROOTFS
}
/android_platform"
RID_FILE_CONTENTS
)
string
(
REPLACE
"RID="
""
ANDROID_RID
"
${
RID_FILE_CONTENTS
}
"
)
string
(
REGEX REPLACE
".*
\\
.([0-9]+)-.*"
"
\\
1"
ANDROID_PLATFORM
"
${
ANDROID_RID
}
"
)
set
(
ANDROID_TOOLCHAIN clang
)
set
(
FEATURE_EVENT_TRACE 0
)
# disable event trace as there is no lttng-ust package in termux repository
...
...
@@ -92,7 +102,7 @@ if("$ENV{__DistroRid}" MATCHES "android.*")
# include official NDK toolchain script
include
(
${
CROSS_ROOTFS
}
/../build/cmake/android.toolchain.cmake
)
elseif
(
CMAKE_SYSTEM_NAME STREQUAL
"FreeBSD"
)
elseif
(
FREEBSD
)
# we cross-compile by instructing clang
set
(
CMAKE_C_COMPILER_TARGET
${
triple
}
)
set
(
CMAKE_CXX_COMPILER_TARGET
${
triple
}
)
...
...
@@ -152,20 +162,20 @@ function(add_toolchain_linker_flag Flag)
set
(
"CMAKE_SHARED_LINKER_FLAGS
${
CONFIG_SUFFIX
}
_INIT"
"
${
CMAKE_SHARED_LINKER_FLAGS
${
CONFIG_SUFFIX
}
_INIT
}
${
Flag
}
"
PARENT_SCOPE
)
endfunction
()
if
(
CMAKE_SYSTEM_NAME STREQUAL
"Linux"
)
if
(
LINUX
)
add_toolchain_linker_flag
(
"-Wl,--rpath-link=
${
CROSS_ROOTFS
}
/lib/
${
TOOLCHAIN
}
"
)
add_toolchain_linker_flag
(
"-Wl,--rpath-link=
${
CROSS_ROOTFS
}
/usr/lib/
${
TOOLCHAIN
}
"
)
endif
()
if
(
TARGET_ARCH_NAME
STREQUAL
"arm"
OR TARGET_ARCH_NAME STREQUAL
"armel
"
)
if
(
DEFINED TIZEN_TOOLCHAIN
)
# For Tizen only
if
(
TARGET_ARCH_NAME
MATCHES
"^(arm|armel)$
"
)
if
(
TIZEN
)
add_toolchain_linker_flag
(
"-B
${
CROSS_ROOTFS
}
/usr/lib/gcc/
${
TIZEN_TOOLCHAIN
}
"
)
add_toolchain_linker_flag
(
"-L
${
CROSS_ROOTFS
}
/lib"
)
add_toolchain_linker_flag
(
"-L
${
CROSS_ROOTFS
}
/usr/lib"
)
add_toolchain_linker_flag
(
"-L
${
CROSS_ROOTFS
}
/usr/lib/gcc/
${
TIZEN_TOOLCHAIN
}
"
)
endif
()
elseif
(
TARGET_ARCH_NAME STREQUAL
"arm64"
)
if
(
DEFINED TIZEN_TOOLCHAIN
)
# For Tizen only
if
(
TIZEN
)
add_toolchain_linker_flag
(
"-B
${
CROSS_ROOTFS
}
/usr/lib64/gcc/
${
TIZEN_TOOLCHAIN
}
"
)
add_toolchain_linker_flag
(
"-L
${
CROSS_ROOTFS
}
/lib64"
)
add_toolchain_linker_flag
(
"-L
${
CROSS_ROOTFS
}
/usr/lib64"
)
...
...
@@ -184,7 +194,7 @@ endif()
# Specify compile options
if
((
TARGET_ARCH_NAME MATCHES
"^(arm|armel|arm64|s390x)$"
AND NOT
"$ENV{__DistroRid}"
MATCHES
"android.*"
)
OR ILLUMOS
)
if
((
TARGET_ARCH_NAME MATCHES
"^(arm|armel|arm64|s390x)$"
AND NOT
ANDROID
)
OR ILLUMOS
)
set
(
CMAKE_C_COMPILER_TARGET
${
TOOLCHAIN
}
)
set
(
CMAKE_CXX_COMPILER_TARGET
${
TOOLCHAIN
}
)
set
(
CMAKE_ASM_COMPILER_TARGET
${
TOOLCHAIN
}
)
...
...
@@ -211,7 +221,7 @@ elseif(TARGET_ARCH_NAME STREQUAL "x86")
add_compile_options
(
-Wno-error=unused-command-line-argument
)
endif
()
if
(
DEFINED TIZEN_TOOLCHAI
N
)
if
(
TIZE
N
)
if
(
TARGET_ARCH_NAME MATCHES
"^(arm|armel|arm64)$"
)
add_compile_options
(
-Wno-deprecated-declarations
)
# compile-time option
add_compile_options
(
-D__extern_always_inline=inline
)
# compile-time option
...
...
eng/common/native/init-compiler.sh
浏览文件 @
d629584b
...
...
@@ -2,25 +2,45 @@
#
# This file detects the C/C++ compiler and exports it to the CC/CXX environment variables
#
# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
# NOTE: some scripts source this file and rely on stdout being empty, make sure to not output anything here!
if
[[
"$#"
-lt
3
]]
;
then
echo
"Usage..."
echo
"init-compiler.sh <script directory> <Architecture> <compiler>
<compiler major version> <compiler minor version>
"
echo
"init-compiler.sh <script directory> <Architecture> <compiler>"
echo
"Specify the script directory."
echo
"Specify the target architecture."
echo
"Specify the name of compiler (clang or gcc)."
echo
"Specify the major version of compiler."
echo
"Specify the minor version of compiler."
exit
1
fi
nativescriptroot
=
"
$1
"
build_arch
=
"
$2
"
compiler
=
"
$3
"
case
"
$compiler
"
in
clang
*
|
-clang
*
|
--clang
*
)
# clangx.y or clang-x.y
version
=
"
$(
echo
"
$compiler
"
|
tr
-d
'[:alpha:]-='
)
"
parts
=(
${
version
//./
}
)
majorVersion
=
"
${
parts
[0]
}
"
minorVersion
=
"
${
parts
[1]
}
"
if
[[
-z
"
$minorVersion
"
&&
"
$majorVersion
"
-le
6
]]
;
then
minorVersion
=
0
;
fi
compiler
=
clang
;;
gcc
*
|
-gcc
*
|
--gcc
*
)
# gccx.y or gcc-x.y
version
=
"
$(
echo
"
$compiler
"
|
tr
-d
'[:alpha:]-='
)
"
parts
=(
${
version
//./
}
)
majorVersion
=
"
${
parts
[0]
}
"
minorVersion
=
"
${
parts
[1]
}
"
compiler
=
gcc
;;
esac
cxxCompiler
=
"
$compiler
++"
majorVersion
=
"
$4
"
minorVersion
=
"
$5
"
.
"
$nativescriptroot
"
/../pipeline-logging-functions.sh
...
...
global.json
浏览文件 @
d629584b
...
...
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks"
:
{
"Microsoft.DotNet.Arcade.Sdk"
:
"7.0.0-beta.2162
3.2
"
,
"Microsoft.DotNet.Helix.Sdk"
:
"7.0.0-beta.2162
3.2
"
"Microsoft.DotNet.Arcade.Sdk"
:
"7.0.0-beta.2162
7.1
"
,
"Microsoft.DotNet.Helix.Sdk"
:
"7.0.0-beta.2162
7.1
"
},
"sdk"
:
{
"version"
:
"6.0.100"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录