Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
wpf
提交
206fddae
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,发现更多精彩内容 >>
未验证
提交
206fddae
编写于
1月 25, 2022
作者:
D
dotnet-maestro[bot]
提交者:
GitHub
1月 25, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update dependencies from
https://github.com/dotnet/arcade
build 20220124.13 (#5985)
[main] Update dependencies from dotnet/arcade
上级
21161c25
变更
8
显示空白变更内容
内联
并排
Showing
8 changed file
with
80 addition
and
32 deletion
+80
-32
eng/Version.Details.xml
eng/Version.Details.xml
+10
-10
eng/Versions.props
eng/Versions.props
+3
-3
eng/common/templates/job/execute-sdl.yml
eng/common/templates/job/execute-sdl.yml
+8
-2
eng/common/templates/job/onelocbuild.yml
eng/common/templates/job/onelocbuild.yml
+14
-5
eng/common/templates/jobs/jobs.yml
eng/common/templates/jobs/jobs.yml
+8
-2
eng/common/templates/post-build/post-build.yml
eng/common/templates/post-build/post-build.yml
+34
-8
eng/common/templates/post-build/setup-maestro-vars.yml
eng/common/templates/post-build/setup-maestro-vars.yml
+1
-0
global.json
global.json
+2
-2
未找到文件。
eng/Version.Details.xml
浏览文件 @
206fddae
...
...
@@ -75,25 +75,25 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"7.0.0-beta.2207
1.6
"
>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"7.0.0-beta.2207
4.13
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007
</Sha>
<Sha>
b6483cac5832aa5207692517f9a49ce1741a3041
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.CodeAnalysis"
Version=
"7.0.0-beta.2207
1.6
"
>
<Dependency
Name=
"Microsoft.DotNet.CodeAnalysis"
Version=
"7.0.0-beta.2207
4.13
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007
</Sha>
<Sha>
b6483cac5832aa5207692517f9a49ce1741a3041
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.Helix.Sdk"
Version=
"7.0.0-beta.2207
1.6
"
>
<Dependency
Name=
"Microsoft.DotNet.Helix.Sdk"
Version=
"7.0.0-beta.2207
4.13
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007
</Sha>
<Sha>
b6483cac5832aa5207692517f9a49ce1741a3041
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.ApiCompat"
Version=
"7.0.0-beta.2207
1.6
"
>
<Dependency
Name=
"Microsoft.DotNet.ApiCompat"
Version=
"7.0.0-beta.2207
4.13
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007
</Sha>
<Sha>
b6483cac5832aa5207692517f9a49ce1741a3041
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.GenAPI"
Version=
"7.0.0-beta.2207
1.6
"
>
<Dependency
Name=
"Microsoft.DotNet.GenAPI"
Version=
"7.0.0-beta.2207
4.13
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
e1ea8873d2e0175c1d1e49b3884cd2e9c6ef5007
</Sha>
<Sha>
b6483cac5832aa5207692517f9a49ce1741a3041
</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
eng/Versions.props
浏览文件 @
206fddae
...
...
@@ -37,9 +37,9 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>
7.0.0-beta.2207
1.6
</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>
7.0.0-beta.2207
1.6
</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>
7.0.0-beta.2207
1.6
</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>
7.0.0-beta.2207
4.13
</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>
7.0.0-beta.2207
4.13
</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>
7.0.0-beta.2207
4.13
</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/templates/job/execute-sdl.yml
浏览文件 @
206fddae
...
...
@@ -47,6 +47,12 @@ jobs:
-
name
:
GuardianVersion
value
:
${{ coalesce(parameters.overrideGuardianVersion, '$(DefaultGuardianVersion)') }}
pool
:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}
:
name
:
VSEngSS-MicroBuild2022-1ES
demands
:
Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}
:
name
:
NetCore1ESPool-Internal
demands
:
ImageOverride -equals Build.Server.Amd64.VS2019
steps
:
...
...
eng/common/templates/job/onelocbuild.yml
浏览文件 @
206fddae
...
...
@@ -3,9 +3,7 @@ parameters:
dependsOn
:
'
'
# Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool
pool
:
name
:
NetCore1ESPool-Internal
demands
:
ImageOverride -equals Build.Server.Amd64.VS2019
pool
:
'
'
CeapexPat
:
$(dn-bot-ceapex-package-r)
# PAT for the loc AzDO instance https://dev.azure.com/ceapex
GithubPat
:
$(BotAccount-dotnet-bot-repo-PAT)
...
...
@@ -32,7 +30,18 @@ jobs:
displayName
:
OneLocBuild
${{ if ne(parameters.pool, '') }}
:
pool
:
${{ parameters.pool }}
${{ if eq(parameters.pool, '') }}
:
pool
:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}
:
name
:
VSEngSS-MicroBuild2022-1ES
demands
:
Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}
:
name
:
NetCore1ESPool-Internal
demands
:
ImageOverride -equals Build.Server.Amd64.VS2019
variables
:
-
group
:
OneLocBuildVariables
# Contains the CeapexPat and GithubPat
...
...
eng/common/templates/jobs/jobs.yml
浏览文件 @
206fddae
...
...
@@ -83,6 +83,12 @@ jobs:
-
${{ if eq(parameters.enableSourceBuild,
true
) }}
:
-
Source_Build_Complete
pool
:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}
:
name
:
VSEngSS-MicroBuild2022-1ES
demands
:
Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}
:
name
:
NetCore1ESPool-Internal
demands
:
ImageOverride -equals Build.Server.Amd64.VS2019
...
...
eng/common/templates/post-build/post-build.yml
浏览文件 @
206fddae
...
...
@@ -94,6 +94,12 @@ stages:
displayName
:
NuGet Validation
condition
:
eq( ${{ parameters.enableNugetValidation }}, 'true')
pool
:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}
:
name
:
VSEngSS-MicroBuild2022-1ES
demands
:
Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}
:
name
:
NetCore1ESPool-Internal
demands
:
ImageOverride -equals Build.Server.Amd64.VS2019
...
...
@@ -125,6 +131,12 @@ stages:
displayName
:
Signing Validation
condition
:
and( eq( ${{ parameters.enableSigningValidation }}, 'true'), ne( variables['PostBuildSign'], 'true'))
pool
:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}
:
name
:
VSEngSS-MicroBuild2022-1ES
demands
:
Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}
:
name
:
NetCore1ESPool-Internal
demands
:
ImageOverride -equals Build.Server.Amd64.VS2019
steps
:
...
...
@@ -179,6 +191,12 @@ stages:
displayName
:
SourceLink Validation
condition
:
eq( ${{ parameters.enableSourceLinkValidation }}, 'true')
pool
:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}
:
name
:
VSEngSS-MicroBuild2022-1ES
demands
:
Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}
:
name
:
NetCore1ESPool-Internal
demands
:
ImageOverride -equals Build.Server.Amd64.VS2019
steps
:
...
...
@@ -230,6 +248,12 @@ stages:
displayName
:
Publish Using Darc
timeoutInMinutes
:
120
pool
:
# We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com)
${{ if eq(variables['System.TeamProject'], 'DevDiv') }}
:
name
:
VSEngSS-MicroBuild2022-1ES
demands
:
Cmd
# If it's not devdiv, it's dnceng
${{ if ne(variables['System.TeamProject'], 'DevDiv') }}
:
name
:
NetCore1ESPool-Internal
demands
:
ImageOverride -equals Build.Server.Amd64.VS2019
steps
:
...
...
@@ -238,6 +262,8 @@ stages:
BARBuildId
:
${{ parameters.BARBuildId }}
PromoteToChannelIds
:
${{ parameters.PromoteToChannelIds }}
-
task
:
NuGetAuthenticate@0
-
task
:
PowerShell@2
displayName
:
Publish Using Darc
inputs
:
...
...
eng/common/templates/post-build/setup-maestro-vars.yml
浏览文件 @
206fddae
...
...
@@ -16,6 +16,7 @@ steps:
displayName
:
Set Release Configs Vars
inputs
:
targetType
:
inline
pwsh
:
true
script
:
|
try {
if (!$Env:PromoteToMaestroChannels -or $Env:PromoteToMaestroChannels.Trim() -eq '') {
...
...
global.json
浏览文件 @
206fddae
...
...
@@ -12,8 +12,8 @@
}
},
"msbuild-sdks"
:
{
"Microsoft.DotNet.Arcade.Sdk"
:
"7.0.0-beta.2207
1.6
"
,
"Microsoft.DotNet.Helix.Sdk"
:
"7.0.0-beta.2207
1.6
"
"Microsoft.DotNet.Arcade.Sdk"
:
"7.0.0-beta.2207
4.13
"
,
"Microsoft.DotNet.Helix.Sdk"
:
"7.0.0-beta.2207
4.13
"
},
"sdk"
:
{
"version"
:
"7.0.100-alpha.1.22053.1"
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录