Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
wpf
提交
b62c8e36
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,发现更多精彩内容 >>
未验证
提交
b62c8e36
编写于
2月 06, 2021
作者:
D
dotnet-maestro[bot]
提交者:
GitHub
2月 06, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update dependencies from
https://github.com/dotnet/arcade
build 20210205.5 (#4142)
[master] Update dependencies from dotnet/arcade
上级
603003f6
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
20 addition
and
25 deletion
+20
-25
eng/Version.Details.xml
eng/Version.Details.xml
+10
-10
eng/Versions.props
eng/Versions.props
+3
-3
eng/common/dotnet-install.sh
eng/common/dotnet-install.sh
+2
-7
eng/common/performance/performance-setup.ps1
eng/common/performance/performance-setup.ps1
+2
-2
eng/common/performance/performance-setup.sh
eng/common/performance/performance-setup.sh
+1
-1
global.json
global.json
+2
-2
未找到文件。
eng/Version.Details.xml
浏览文件 @
b62c8e36
...
...
@@ -99,25 +99,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"6.0.0-beta.2110
1.7
"
>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"6.0.0-beta.2110
5.5
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
2b430e5bbfaec37a6cead2f0cf79157f01f1a623
</Sha>
<Sha>
fc83e59329203724d4a63c4f6c843be62983a35e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.CodeAnalysis"
Version=
"6.0.0-beta.2110
1.7
"
>
<Dependency
Name=
"Microsoft.DotNet.CodeAnalysis"
Version=
"6.0.0-beta.2110
5.5
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
2b430e5bbfaec37a6cead2f0cf79157f01f1a623
</Sha>
<Sha>
fc83e59329203724d4a63c4f6c843be62983a35e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.Helix.Sdk"
Version=
"6.0.0-beta.2110
1.7
"
>
<Dependency
Name=
"Microsoft.DotNet.Helix.Sdk"
Version=
"6.0.0-beta.2110
5.5
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
2b430e5bbfaec37a6cead2f0cf79157f01f1a623
</Sha>
<Sha>
fc83e59329203724d4a63c4f6c843be62983a35e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.ApiCompat"
Version=
"6.0.0-beta.2110
1.7
"
>
<Dependency
Name=
"Microsoft.DotNet.ApiCompat"
Version=
"6.0.0-beta.2110
5.5
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
2b430e5bbfaec37a6cead2f0cf79157f01f1a623
</Sha>
<Sha>
fc83e59329203724d4a63c4f6c843be62983a35e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.GenAPI"
Version=
"6.0.0-beta.2110
1.7
"
>
<Dependency
Name=
"Microsoft.DotNet.GenAPI"
Version=
"6.0.0-beta.2110
5.5
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
2b430e5bbfaec37a6cead2f0cf79157f01f1a623
</Sha>
<Sha>
fc83e59329203724d4a63c4f6c843be62983a35e
</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
eng/Versions.props
浏览文件 @
b62c8e36
...
...
@@ -43,9 +43,9 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>
6.0.0-beta.2110
1.7
</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>
6.0.0-beta.2110
1.7
</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>
6.0.0-beta.2110
1.7
</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>
6.0.0-beta.2110
5.5
</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>
6.0.0-beta.2110
5.5
</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>
6.0.0-beta.2110
5.5
</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<PropertyGroup>
...
...
eng/common/dotnet-install.sh
浏览文件 @
b62c8e36
...
...
@@ -49,13 +49,8 @@ while [[ $# > 0 ]]; do
shift
done
# Use uname to determine what the CPU is.
cpuname
=
$(
uname
-p
)
# Some Linux platforms report unknown for platform, but the arch for machine.
if
[[
"
$cpuname
"
==
"unknown"
]]
;
then
cpuname
=
$(
uname
-m
)
fi
# Use uname to determine what the CPU is, see https://en.wikipedia.org/wiki/Uname#Examples
cpuname
=
$(
uname
-m
)
case
$cpuname
in
aarch64
)
buildarch
=
arm64
...
...
eng/common/performance/performance-setup.ps1
浏览文件 @
b62c8e36
...
...
@@ -3,7 +3,7 @@ Param(
[
string
]
$CoreRootDirectory
,
[
string
]
$BaselineCoreRootDirectory
,
[
string
]
$Architecture
=
"x64"
,
[
string
]
$Framework
=
"net
6
.0"
,
[
string
]
$Framework
=
"net
5
.0"
,
[
string
]
$CompilationMode
=
"Tiered"
,
[
string
]
$Repository
=
$
env
:
BUILD_REPOSITORY_NAME
,
[
string
]
$Branch
=
$
env
:
BUILD_SOURCEBRANCH
,
...
...
@@ -36,7 +36,7 @@ $HelixSourcePrefix = "pr"
$Queue
=
"Windows.10.Amd64.ClientRS4.DevEx.15.8.Open"
# TODO: Implement a better logic to determine if Framework is .NET Core or >= .NET 5.
if
(
$Framework
.
StartsWith
(
"netcoreapp"
)
-or
(
$Framework
-eq
"net
6
.0"
))
{
if
(
$Framework
.
StartsWith
(
"netcoreapp"
)
-or
(
$Framework
-eq
"net
5
.0"
))
{
$Queue
=
"Windows.10.Amd64.ClientRS5.Open"
}
...
...
eng/common/performance/performance-setup.sh
浏览文件 @
b62c8e36
...
...
@@ -4,7 +4,7 @@ source_directory=$BUILD_SOURCESDIRECTORY
core_root_directory
=
baseline_core_root_directory
=
architecture
=
x64
framework
=
net
6
.0
framework
=
net
5
.0
compilation_mode
=
tiered
repository
=
$BUILD_REPOSITORY_NAME
branch
=
$BUILD_SOURCEBRANCH
...
...
global.json
浏览文件 @
b62c8e36
...
...
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks"
:
{
"Microsoft.DotNet.Arcade.Sdk"
:
"6.0.0-beta.2110
1.7
"
,
"Microsoft.DotNet.Helix.Sdk"
:
"6.0.0-beta.2110
1.7
"
"Microsoft.DotNet.Arcade.Sdk"
:
"6.0.0-beta.2110
5.5
"
,
"Microsoft.DotNet.Helix.Sdk"
:
"6.0.0-beta.2110
5.5
"
},
"sdk"
:
{
"version"
:
"6.0.100-preview.1.21077.13"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录