Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
runtime
提交
d8de9db7
R
runtime
项目概览
dotNET Platform
/
runtime
11 个月 前同步成功
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
runtime
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
d8de9db7
编写于
1月 14, 2021
作者:
D
dotnet-maestro[bot]
提交者:
GitHub
1月 14, 2021
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[master] Update dependencies from dotnet/arcade dotnet/xharness (#46980)
[master] Update dependencies from dotnet/arcade dotnet/xharness
上级
6936e444
变更
6
显示空白变更内容
内联
并排
Showing
6 changed file
with
71 addition
and
59 deletion
+71
-59
.config/dotnet-tools.json
.config/dotnet-tools.json
+1
-1
eng/Version.Details.xml
eng/Version.Details.xml
+38
-38
eng/Versions.props
eng/Versions.props
+14
-14
eng/common/templates/job/source-index-stage1.yml
eng/common/templates/job/source-index-stage1.yml
+12
-0
eng/common/templates/post-build/post-build.yml
eng/common/templates/post-build/post-build.yml
+1
-1
global.json
global.json
+5
-5
未找到文件。
.config/dotnet-tools.json
浏览文件 @
d8de9db7
...
...
@@ -15,7 +15,7 @@
]
},
"microsoft.dotnet.xharness.cli"
:
{
"version"
:
"1.0.0-prerelease.2106
3.1
"
,
"version"
:
"1.0.0-prerelease.2106
4.3
"
,
"commands"
:
[
"xharness"
]
...
...
eng/Version.Details.xml
浏览文件 @
d8de9db7
...
...
@@ -6,73 +6,73 @@
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.Helix.Sdk"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.Helix.Sdk"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.ApiCompat"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.ApiCompat"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.GenAPI"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.GenAPI"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.GenFacades"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.GenFacades"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.XUnitExtensions"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.XUnitExtensions"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.XUnitConsoleRunner"
Version=
"2.5.1-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.XUnitConsoleRunner"
Version=
"2.5.1-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.Build.Tasks.Archives"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.Build.Tasks.Archives"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.Build.Tasks.Packaging"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.Build.Tasks.Packaging"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.Build.Tasks.Installers"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.Build.Tasks.Installers"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.CodeAnalysis"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.CodeAnalysis"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.RemoteExecutor"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.RemoteExecutor"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.Build.Tasks.Feed"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.Build.Tasks.Feed"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.VersionTools.Tasks"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.VersionTools.Tasks"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.SharedFramework.Sdk"
Version=
"6.0.0-beta.210
58.3
"
>
<Dependency
Name=
"Microsoft.DotNet.SharedFramework.Sdk"
Version=
"6.0.0-beta.210
62.10
"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
1571d6b095014ad63fdb48b10f5dea912f96872
e
</Sha>
<Sha>
ff8fec9066eca51a26abf723dd7d92e20926a90
e
</Sha>
</Dependency>
<Dependency
Name=
"optimization.windows_nt-x64.IBC.CoreFx"
Version=
"99.99.99-master-20200806.6"
>
<Uri>
https://dev.azure.com/dnceng/internal/_git/dotnet-optimization
</Uri>
...
...
@@ -202,13 +202,13 @@
<Uri>
https://github.com/mono/linker
</Uri>
<Sha>
fc8abeff62398d46ac3408d20f50879e6f2e713f
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.XHarness.TestRunners.Xunit"
Version=
"1.0.0-prerelease.2106
3.1
"
>
<Dependency
Name=
"Microsoft.DotNet.XHarness.TestRunners.Xunit"
Version=
"1.0.0-prerelease.2106
4.3
"
>
<Uri>
https://github.com/dotnet/xharness
</Uri>
<Sha>
dcc8a6231c597824388ed3ce94f9c079e0867b36
</Sha>
<Sha>
cf837a290a9451d3d1b3a09c54c90e5e0f656143
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.XHarness.CLI"
Version=
"1.0.0-prerelease.2106
3.1
"
>
<Dependency
Name=
"Microsoft.DotNet.XHarness.CLI"
Version=
"1.0.0-prerelease.2106
4.3
"
>
<Uri>
https://github.com/dotnet/xharness
</Uri>
<Sha>
dcc8a6231c597824388ed3ce94f9c079e0867b36
</Sha>
<Sha>
cf837a290a9451d3d1b3a09c54c90e5e0f656143
</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
eng/Versions.props
浏览文件 @
d8de9db7
...
...
@@ -47,18 +47,18 @@
<MicrosoftCodeAnalysisNetAnalyzersVersion>6.0.0-preview1.21054.10</MicrosoftCodeAnalysisNetAnalyzersVersion>
<MicrosoftCodeAnalysisCSharpCodeStyleVersion>3.8.0-4.20503.2</MicrosoftCodeAnalysisCSharpCodeStyleVersion>
<!-- Arcade dependencies -->
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.210
58.3
</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.210
58.3
</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.210
58.3
</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.210
58.3
</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.210
58.3
</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.210
58.3
</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.210
58.3
</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.210
58.3
</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.210
58.3
</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.210
58.3
</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.210
58.3
</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.210
58.3
</MicrosoftDotNetVersionToolsTasksVersion>
<MicrosoftDotNetApiCompatVersion>6.0.0-beta.210
62.10
</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetBuildTasksFeedVersion>6.0.0-beta.210
62.10
</MicrosoftDotNetBuildTasksFeedVersion>
<MicrosoftDotNetCodeAnalysisVersion>6.0.0-beta.210
62.10
</MicrosoftDotNetCodeAnalysisVersion>
<MicrosoftDotNetGenAPIVersion>6.0.0-beta.210
62.10
</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetGenFacadesVersion>6.0.0-beta.210
62.10
</MicrosoftDotNetGenFacadesVersion>
<MicrosoftDotNetXUnitExtensionsVersion>6.0.0-beta.210
62.10
</MicrosoftDotNetXUnitExtensionsVersion>
<MicrosoftDotNetXUnitConsoleRunnerVersion>2.5.1-beta.210
62.10
</MicrosoftDotNetXUnitConsoleRunnerVersion>
<MicrosoftDotNetBuildTasksArchivesVersion>6.0.0-beta.210
62.10
</MicrosoftDotNetBuildTasksArchivesVersion>
<MicrosoftDotNetBuildTasksPackagingVersion>6.0.0-beta.210
62.10
</MicrosoftDotNetBuildTasksPackagingVersion>
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.210
62.10
</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetRemoteExecutorVersion>6.0.0-beta.210
62.10
</MicrosoftDotNetRemoteExecutorVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.210
62.10
</MicrosoftDotNetVersionToolsTasksVersion>
<!-- NuGet dependencies -->
<NuGetBuildTasksPackVersion>5.9.0-preview.2</NuGetBuildTasksPackVersion>
<!-- Installer dependencies -->
...
...
@@ -141,8 +141,8 @@
<!-- Testing -->
<MicrosoftNETCoreCoreDisToolsVersion>1.0.1-prerelease-00006</MicrosoftNETCoreCoreDisToolsVersion>
<MicrosoftNETTestSdkVersion>16.9.0-preview-20201201-01</MicrosoftNETTestSdkVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.2106
3.1
</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.2106
3.1
</MicrosoftDotNetXHarnessCLIVersion>
<MicrosoftDotNetXHarnessTestRunnersXunitVersion>1.0.0-prerelease.2106
4.3
</MicrosoftDotNetXHarnessTestRunnersXunitVersion>
<MicrosoftDotNetXHarnessCLIVersion>1.0.0-prerelease.2106
4.3
</MicrosoftDotNetXHarnessCLIVersion>
<XUnitVersion>2.4.1</XUnitVersion>
<XUnitRunnerVisualStudioVersion>2.4.2</XUnitRunnerVisualStudioVersion>
<CoverletCollectorVersion>1.3.0</CoverletCollectorVersion>
...
...
eng/common/templates/job/source-index-stage1.yml
浏览文件 @
d8de9db7
...
...
@@ -3,6 +3,7 @@ parameters:
sourceIndexPackageVersion
:
1.0.0-beta5
sourceIndexPackageSource
:
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
sourceIndexBuildCommand
:
powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci"
preSteps
:
[]
binlogPath
:
artifacts/log/Debug/Build.binlog
pool
:
vmImage
:
vs2017-win2016
...
...
@@ -21,12 +22,20 @@ jobs:
pool
:
${{ parameters.pool }}
steps
:
-
${{ each preStep in parameters.preSteps }}
:
-
${{ preStep }}
-
task
:
UseDotNet@2
displayName
:
Use .NET Core sdk
3.1
inputs
:
packageType
:
sdk
version
:
3.1.x
-
task
:
UseDotNet@2
displayName
:
Use .NET Core sdk
inputs
:
useGlobalJson
:
true
-
script
:
|
dotnet tool install BinLogToSln --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools
dotnet tool install UploadIndexStage1 --version $(SourceIndexPackageVersion) --add-source $(SourceIndexPackageSource) --tool-path .source-index/tools
...
...
@@ -38,9 +47,12 @@ jobs:
-
script
:
BinLogToSln -i $(BinlogPath) -r $(Build.SourcesDirectory) -n $(Build.Repository.Name) -o .source-index/stage1output
displayName
:
Process Binlog into indexable sln
env
:
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX
:
2
-
${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}
:
-
script
:
UploadIndexStage1 -i .source-index/stage1output -n $(Build.Repository.Name)
displayName
:
Upload stage1 artifacts to source index
env
:
BLOB_CONTAINER_URL
:
$(source-dot-net-stage1-blob-container-url)
DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX
:
2
eng/common/templates/post-build/post-build.yml
浏览文件 @
d8de9db7
...
...
@@ -224,7 +224,7 @@ stages:
-
${{ if or(ge(parameters.publishingInfraVersion, 3), eq(parameters.inline, 'false')) }}
:
-
stage
:
publish_using_darc
${{ if or(eq(parameters.enableNugetValidation, 'true'), eq(parameters.enableSigningValidation, 'true'), eq(parameters.enableSourceLinkValidation, 'true'), eq(parameters.SDLValidationParameters.enable, 'true')) }}
:
dependsOn
:
Validate
dependsOn
:
${{ parameters.publishDependsOn }}
${{ if and(ne(parameters.enableNugetValidation, 'true'), ne(parameters.enableSigningValidation, 'true'), ne(parameters.enableSourceLinkValidation, 'true'), ne(parameters.SDLValidationParameters.enable, 'true')) }}
:
dependsOn
:
${{ parameters.validateDependsOn }}
displayName
:
Publish using Darc
...
...
global.json
浏览文件 @
d8de9db7
...
...
@@ -12,11 +12,11 @@
"python3"
:
"3.7.1"
},
"msbuild-sdks"
:
{
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk"
:
"6.0.0-beta.210
58.3
"
,
"Microsoft.DotNet.Arcade.Sdk"
:
"6.0.0-beta.210
58.3
"
,
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk"
:
"6.0.0-beta.210
58.3
"
,
"Microsoft.DotNet.Helix.Sdk"
:
"6.0.0-beta.210
58.3
"
,
"Microsoft.DotNet.SharedFramework.Sdk"
:
"6.0.0-beta.210
58.3
"
,
"Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk"
:
"6.0.0-beta.210
62.10
"
,
"Microsoft.DotNet.Arcade.Sdk"
:
"6.0.0-beta.210
62.10
"
,
"Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk"
:
"6.0.0-beta.210
62.10
"
,
"Microsoft.DotNet.Helix.Sdk"
:
"6.0.0-beta.210
62.10
"
,
"Microsoft.DotNet.SharedFramework.Sdk"
:
"6.0.0-beta.210
62.10
"
,
"Microsoft.FIX-85B6-MERGE-9C38-CONFLICT"
:
"1.0.0"
,
"Microsoft.NET.Sdk.IL"
:
"6.0.0-alpha.1.21060.3"
,
"Microsoft.Build.NoTargets"
:
"2.0.1"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录