Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
wpf
提交
d568fde5
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,发现更多精彩内容 >>
未验证
提交
d568fde5
编写于
6月 23, 2020
作者:
R
Ryland
提交者:
GitHub
6月 23, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #3153 from dotnet/darc-master-89e15d90-235e-4313-959a-f0283bd51d70
[master] Update dependencies from dotnet/arcade
上级
5fe1b0a1
b7f55862
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
61 addition
and
30 deletion
+61
-30
eng/Version.Details.xml
eng/Version.Details.xml
+10
-10
eng/Versions.props
eng/Versions.props
+3
-3
eng/common/cross/armel/tizen-build-rootfs.sh
eng/common/cross/armel/tizen-build-rootfs.sh
+0
-7
eng/common/performance/perfhelixpublish.proj
eng/common/performance/perfhelixpublish.proj
+0
-4
eng/common/templates/post-build/post-build.yml
eng/common/templates/post-build/post-build.yml
+44
-2
global.json
global.json
+4
-4
未找到文件。
eng/Version.Details.xml
浏览文件 @
d568fde5
...
...
@@ -59,13 +59,13 @@
<Uri>
https://github.com/dotnet/runtime
</Uri>
<Sha>
ddea36269ee4522213a6a9db8680f9da03935f7d
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"5.0.0-beta.203
09
.1"
>
<Dependency
Name=
"Microsoft.DotNet.Arcade.Sdk"
Version=
"5.0.0-beta.203
16
.1"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
54d096ee50a9bcf7ac6efd16a07d51af651d20a1
</Sha>
<Sha>
71b580038fb704df63e03c6b7ae7d2c6a4fdd71d
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.CodeAnalysis"
Version=
"5.0.0-beta.203
09
.1"
>
<Dependency
Name=
"Microsoft.DotNet.CodeAnalysis"
Version=
"5.0.0-beta.203
16
.1"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
54d096ee50a9bcf7ac6efd16a07d51af651d20a1
</Sha>
<Sha>
71b580038fb704df63e03c6b7ae7d2c6a4fdd71d
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.NETCore.Platforms"
Version=
"5.0.0-preview.7.20311.2"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Uri>
https://github.com/dotnet/runtime
</Uri>
...
...
@@ -91,17 +91,17 @@
<Uri>
https://github.com/dotnet/runtime
</Uri>
<Sha>
ddea36269ee4522213a6a9db8680f9da03935f7d
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.Helix.Sdk"
Version=
"5.0.0-beta.203
09
.1"
>
<Dependency
Name=
"Microsoft.DotNet.Helix.Sdk"
Version=
"5.0.0-beta.203
16
.1"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
54d096ee50a9bcf7ac6efd16a07d51af651d20a1
</Sha>
<Sha>
71b580038fb704df63e03c6b7ae7d2c6a4fdd71d
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.ApiCompat"
Version=
"5.0.0-beta.203
09
.1"
>
<Dependency
Name=
"Microsoft.DotNet.ApiCompat"
Version=
"5.0.0-beta.203
16
.1"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
54d096ee50a9bcf7ac6efd16a07d51af651d20a1
</Sha>
<Sha>
71b580038fb704df63e03c6b7ae7d2c6a4fdd71d
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.GenAPI"
Version=
"5.0.0-beta.203
09
.1"
>
<Dependency
Name=
"Microsoft.DotNet.GenAPI"
Version=
"5.0.0-beta.203
16
.1"
>
<Uri>
https://github.com/dotnet/arcade
</Uri>
<Sha>
54d096ee50a9bcf7ac6efd16a07d51af651d20a1
</Sha>
<Sha>
71b580038fb704df63e03c6b7ae7d2c6a4fdd71d
</Sha>
</Dependency>
<Dependency
Name=
"System.Resources.Extensions"
Version=
"5.0.0-preview.7.20311.2"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Uri>
https://github.com/dotnet/runtime
</Uri>
...
...
eng/Versions.props
浏览文件 @
d568fde5
...
...
@@ -41,9 +41,9 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/arcade -->
<PropertyGroup>
<MicrosoftDotNetApiCompatVersion>
5.0.0-beta.203
09
.1
</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>
5.0.0-beta.203
09
.1
</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>
5.0.0-beta.203
09
.1
</MicrosoftDotNetGenAPIVersion>
<MicrosoftDotNetApiCompatVersion>
5.0.0-beta.203
16
.1
</MicrosoftDotNetApiCompatVersion>
<MicrosoftDotNetCodeAnalysisPackageVersion>
5.0.0-beta.203
16
.1
</MicrosoftDotNetCodeAnalysisPackageVersion>
<MicrosoftDotNetGenAPIVersion>
5.0.0-beta.203
16
.1
</MicrosoftDotNetGenAPIVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/corefxlab -->
<PropertyGroup>
...
...
eng/common/cross/armel/tizen-build-rootfs.sh
浏览文件 @
d568fde5
...
...
@@ -9,13 +9,6 @@ if [[ -z "$ROOTFS_DIR" ]]; then
exit
1
;
fi
# Clean-up (TODO-Cleanup: We may already delete $ROOTFS_DIR at ./cross/build-rootfs.sh.)
# hk0110
if
[
-d
"
$ROOTFS_DIR
"
]
;
then
umount
$ROOTFS_DIR
/
*
rm
-rf
$ROOTFS_DIR
fi
TIZEN_TMP_DIR
=
$ROOTFS_DIR
/tizen_tmp
mkdir
-p
$TIZEN_TMP_DIR
...
...
eng/common/performance/perfhelixpublish.proj
浏览文件 @
d568fde5
...
...
@@ -152,10 +152,6 @@
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --single System.Private.CoreLib.dll --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
</HelixWorkItem>
<HelixWorkItem Include="Crossgen2 Composite Framework R2R">
<PayloadDirectory>$(WorkItemDirectory)\ScenarioCorrelation</PayloadDirectory>
<Command>$(Python) %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\test.py crossgen2 --composite %HELIX_CORRELATION_PAYLOAD%\performance\src\scenarios\crossgen2\framework-r2r.dll.rsp --core-root %HELIX_CORRELATION_PAYLOAD%\Core_Root</Command>
</HelixWorkItem>
</ItemGroup>
</Project>
\ No newline at end of file
eng/common/templates/post-build/post-build.yml
浏览文件 @
d568fde5
...
...
@@ -48,11 +48,14 @@ parameters:
NetEngServicesProdChannelId
:
679
Net5Preview5ChannelId
:
857
Net5Preview6ChannelId
:
1013
Net5Preview7ChannelId
:
10
14
Net5Preview7ChannelId
:
10
65
NetCoreSDK313xxChannelId
:
759
NetCoreSDK313xxInternalChannelId
:
760
NetCoreSDK314xxChannelId
:
921
NetCoreSDK314xxInternalChannelId
:
922
VS166ChannelId
:
1010
VS167ChannelId
:
1011
VSMasterChannelId
:
1012
stages
:
-
${{ if ne(parameters.inline, 'true') }}
:
...
...
@@ -111,7 +114,7 @@ stages:
inputs
:
filePath
:
$(Build.SourcesDirectory)/eng/common/post-build/check-channel-consistency.ps1
arguments
:
-PromoteToChannels "$(TargetChannels)"
-AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview5ChannelId}},${{parameters.Net5Preview6ChannelId}},${{parameters.Net5Preview7ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}}
-AvailableChannelIds ${{parameters.NetEngLatestChannelId}},${{parameters.NetEngValidationChannelId}},${{parameters.NetDev5ChannelId}},${{parameters.GeneralTestingChannelId}},${{parameters.NETCoreToolingDevChannelId}},${{parameters.NETCoreToolingReleaseChannelId}},${{parameters.NETInternalToolingChannelId}},${{parameters.NETCoreExperimentalChannelId}},${{parameters.NetEngServicesIntChannelId}},${{parameters.NetEngServicesProdChannelId}},${{parameters.Net5Preview5ChannelId}},${{parameters.Net5Preview6ChannelId}},${{parameters.Net5Preview7ChannelId}},${{parameters.NetCoreSDK313xxChannelId}},${{parameters.NetCoreSDK313xxInternalChannelId}},${{parameters.NetCoreSDK314xxChannelId}},${{parameters.NetCoreSDK314xxInternalChannelId}}
,${{parameters.VS166ChannelId}}${{parameters.VS167ChannelId}},${{parameters.VSMasterChannelId}}
-
job
:
displayName
:
NuGet Validation
...
...
@@ -479,3 +482,42 @@ stages:
transportFeed
:
'
https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-transport/nuget/v3/index.json'
shippingFeed
:
'
https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal/nuget/v3/index.json'
symbolsFeed
:
'
https://pkgs.dev.azure.com/dnceng/_packaging/dotnet3.1-internal-symbols/nuget/v3/index.json'
-
template
:
\eng\common\templates\post-build\channels\generic-public-channel.yml
parameters
:
artifactsPublishingAdditionalParameters
:
${{ parameters.artifactsPublishingAdditionalParameters }}
dependsOn
:
${{ parameters.publishDependsOn }}
publishInstallersAndChecksums
:
${{ parameters.publishInstallersAndChecksums }}
symbolPublishingAdditionalParameters
:
${{ parameters.symbolPublishingAdditionalParameters }}
stageName
:
'
VS16_6_Publishing'
channelName
:
'
VS
16.6'
channelId
:
${{ parameters.VS166ChannelId }}
transportFeed
:
'
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
shippingFeed
:
'
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
symbolsFeed
:
'
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
template
:
\eng\common\templates\post-build\channels\generic-public-channel.yml
parameters
:
artifactsPublishingAdditionalParameters
:
${{ parameters.artifactsPublishingAdditionalParameters }}
dependsOn
:
${{ parameters.publishDependsOn }}
publishInstallersAndChecksums
:
${{ parameters.publishInstallersAndChecksums }}
symbolPublishingAdditionalParameters
:
${{ parameters.symbolPublishingAdditionalParameters }}
stageName
:
'
VS16_7_Publishing'
channelName
:
'
VS
16.7'
channelId
:
${{ parameters.VS167ChannelId }}
transportFeed
:
'
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
shippingFeed
:
'
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
symbolsFeed
:
'
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
-
template
:
\eng\common\templates\post-build\channels\generic-public-channel.yml
parameters
:
artifactsPublishingAdditionalParameters
:
${{ parameters.artifactsPublishingAdditionalParameters }}
dependsOn
:
${{ parameters.publishDependsOn }}
publishInstallersAndChecksums
:
${{ parameters.publishInstallersAndChecksums }}
symbolPublishingAdditionalParameters
:
${{ parameters.symbolPublishingAdditionalParameters }}
stageName
:
'
VS_Master_Publishing'
channelName
:
'
VS
Master'
channelId
:
${{ parameters.VSMasterChannelId }}
transportFeed
:
'
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-transport/nuget/v3/index.json'
shippingFeed
:
'
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json'
symbolsFeed
:
'
https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools-symbols/nuget/v3/index.json'
\ No newline at end of file
global.json
浏览文件 @
d568fde5
{
"tools"
:
{
"dotnet"
:
"5.0.100-preview.6.20
266.3
"
,
"dotnet"
:
"5.0.100-preview.6.20
323.1
"
,
"runtimes"
:
{
"dotnet"
:
[
"2.1.7"
,
...
...
@@ -12,11 +12,11 @@
}
},
"msbuild-sdks"
:
{
"Microsoft.DotNet.Arcade.Sdk"
:
"5.0.0-beta.203
09
.1"
,
"Microsoft.DotNet.Helix.Sdk"
:
"5.0.0-beta.203
09
.1"
"Microsoft.DotNet.Arcade.Sdk"
:
"5.0.0-beta.203
16
.1"
,
"Microsoft.DotNet.Helix.Sdk"
:
"5.0.0-beta.203
16
.1"
},
"sdk"
:
{
"version"
:
"5.0.100-preview.6.20
266.3
"
"version"
:
"5.0.100-preview.6.20
323.1
"
},
"native-tools"
:
{
"strawberry-perl"
:
"5.28.1.1-1"
,
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录