Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
dotNET Platform
wpf
提交
c2a17b1c
W
wpf
项目概览
dotNET Platform
/
wpf
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
未验证
提交
c2a17b1c
编写于
7月 12, 2022
作者:
W
William Godbe
提交者:
GitHub
7月 12, 2022
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #6783 from wtgodbe/internal-merge-6.0-2022-07-12-1059
Merging internal commits for release/6.0
上级
45038edb
9281791b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
25 addition
and
31 deletion
+25
-31
NuGet.config
NuGet.config
+2
-8
eng/Version.Details.xml
eng/Version.Details.xml
+16
-16
eng/Versions.props
eng/Versions.props
+7
-7
未找到文件。
NuGet.config
浏览文件 @
c2a17b1c
...
...
@@ -5,10 +5,7 @@
<
clear
/>
<!--
Begin
:
Package
sources
managed
by
Dependency
Flow
automation
.
Do
not
edit
the
sources
below
.-->
<!--
Begin
:
Package
sources
from
dotnet
-
runtime
-->
<
add
key
=
"darc-int-dotnet-runtime-7cca709"
value
=
"https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-7cca709d/nuget/v3/index.json"
/>
<
add
key
=
"darc-int-dotnet-runtime-7cca709-4"
value
=
"https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-7cca709d-4/nuget/v3/index.json"
/>
<
add
key
=
"darc-int-dotnet-runtime-7cca709-3"
value
=
"https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-7cca709d-3/nuget/v3/index.json"
/>
<
add
key
=
"darc-int-dotnet-runtime-7cca709-1"
value
=
"https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-7cca709d-1/nuget/v3/index.json"
/>
<
add
key
=
"darc-int-dotnet-runtime-0ec02c8"
value
=
"https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0ec02c8c/nuget/v3/index.json"
/>
<!--
End
:
Package
sources
from
dotnet
-
runtime
-->
<!--
End
:
Package
sources
managed
by
Dependency
Flow
automation
.
Do
not
edit
the
sources
above
.-->
<
add
key
=
"dotnet-eng"
value
=
"https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json"
/>
...
...
@@ -22,10 +19,7 @@
<
disabledPackageSources
>
<!--
Begin
:
Package
sources
managed
by
Dependency
Flow
automation
.
Do
not
edit
the
sources
below
.-->
<!--
Begin
:
Package
sources
from
dotnet
-
runtime
-->
<
add
key
=
"darc-int-dotnet-runtime-7cca709-1"
value
=
"true"
/>
<
add
key
=
"darc-int-dotnet-runtime-7cca709-3"
value
=
"true"
/>
<
add
key
=
"darc-int-dotnet-runtime-7cca709-4"
value
=
"true"
/>
<
add
key
=
"darc-int-dotnet-runtime-7cca709"
value
=
"true"
/>
<
add
key
=
"darc-int-dotnet-runtime-0ec02c8"
value
=
"true"
/>
<!--
End
:
Package
sources
from
dotnet
-
runtime
-->
<!--
End
:
Package
sources
managed
by
Dependency
Flow
automation
.
Do
not
edit
the
sources
above
.-->
</
disabledPackageSources
>
...
...
eng/Version.Details.xml
浏览文件 @
c2a17b1c
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency
Name=
"Microsoft.Private.Winforms"
Version=
"6.0.
6-servicing.22267.5
"
>
<Dependency
Name=
"Microsoft.Private.Winforms"
Version=
"6.0.
7-servicing.22322.3
"
>
<Uri>
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
</Uri>
<Sha>
604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8
</Sha>
<Sha>
24977050704b627e631caf7b1ca4bcb0543f3ab2
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.Dotnet.WinForms.ProjectTemplates"
Version=
"6.0.
6-servicing.22267.5
"
>
<Dependency
Name=
"Microsoft.Dotnet.WinForms.ProjectTemplates"
Version=
"6.0.
7-servicing.22322.3
"
>
<Uri>
https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
</Uri>
<Sha>
604b5d0a197efa1dc7a5ae5d91a0492fd7fbadf8
</Sha>
<Sha>
24977050704b627e631caf7b1ca4bcb0543f3ab2
</Sha>
</Dependency>
<Dependency
Name=
"System.CodeDom"
Version=
"6.0.0"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Uri>
https://github.com/dotnet/runtime
</Uri>
...
...
@@ -45,9 +45,9 @@
<Uri>
https://github.com/dotnet/runtime
</Uri>
<Sha>
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.NETCore.Platforms"
Version=
"6.0.
4
"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Dependency
Name=
"Microsoft.NETCore.Platforms"
Version=
"6.0.
5
"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Uri>
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
</Uri>
<Sha>
7cca709db2944a09b4db6ca7b20c457ff260fb5a
</Sha>
<Sha>
0ec02c8c96e2eda06dc5b5edfdbdba0f36415082
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.DotNet.Wpf.DncEng"
Version=
"6.0.0-rtm.22314.4"
>
<Uri>
https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int
</Uri>
...
...
@@ -57,29 +57,29 @@
<Uri>
https://github.com/dotnet/runtime
</Uri>
<Sha>
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.NETCore.ILDAsm"
Version=
"6.0.
6-servicing.22267.7
"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Dependency
Name=
"Microsoft.NETCore.ILDAsm"
Version=
"6.0.
7-servicing.22322.2
"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Uri>
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
</Uri>
<Sha>
7cca709db2944a09b4db6ca7b20c457ff260fb5a
</Sha>
<Sha>
0ec02c8c96e2eda06dc5b5edfdbdba0f36415082
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.NETCore.ILAsm"
Version=
"6.0.
6-servicing.22267.7
"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Dependency
Name=
"Microsoft.NETCore.ILAsm"
Version=
"6.0.
7-servicing.22322.2
"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Uri>
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
</Uri>
<Sha>
7cca709db2944a09b4db6ca7b20c457ff260fb5a
</Sha>
<Sha>
0ec02c8c96e2eda06dc5b5edfdbdba0f36415082
</Sha>
</Dependency>
<Dependency
Name=
"System.Resources.Extensions"
Version=
"6.0.0"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Uri>
https://github.com/dotnet/runtime
</Uri>
<Sha>
4822e3c3aa77eb82b2fb33c9321f923cf11ddde6
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.NETCore.App.Ref"
Version=
"6.0.
6
"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Dependency
Name=
"Microsoft.NETCore.App.Ref"
Version=
"6.0.
7
"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Uri>
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
</Uri>
<Sha>
7cca709db2944a09b4db6ca7b20c457ff260fb5a
</Sha>
<Sha>
0ec02c8c96e2eda06dc5b5edfdbdba0f36415082
</Sha>
</Dependency>
<Dependency
Name=
"Microsoft.NETCore.App.Runtime.win-x64"
Version=
"6.0.
6
"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Dependency
Name=
"Microsoft.NETCore.App.Runtime.win-x64"
Version=
"6.0.
7
"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Uri>
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
</Uri>
<Sha>
7cca709db2944a09b4db6ca7b20c457ff260fb5a
</Sha>
<Sha>
0ec02c8c96e2eda06dc5b5edfdbdba0f36415082
</Sha>
</Dependency>
<Dependency
Name=
"VS.Redist.Common.NetCore.SharedFramework.x64.6.0"
Version=
"6.0.
6-servicing.22267.7
"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Dependency
Name=
"VS.Redist.Common.NetCore.SharedFramework.x64.6.0"
Version=
"6.0.
7-servicing.22322.2
"
CoherentParentDependency=
"Microsoft.Private.Winforms"
>
<Uri>
https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
</Uri>
<Sha>
7cca709db2944a09b4db6ca7b20c457ff260fb5a
</Sha>
<Sha>
0ec02c8c96e2eda06dc5b5edfdbdba0f36415082
</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
...
...
eng/Versions.props
浏览文件 @
c2a17b1c
...
...
@@ -26,20 +26,20 @@
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>
6.0.
6-servicing.22267.5
</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>
6.0.
7-servicing.22322.3
</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>
5.0.0-alpha1.19562.1
</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>
6.0.
6-servicing.22267.7
</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>
6.0.
6-servicing.22267.7
</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>
6.0.
7-servicing.22322.2
</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>
6.0.
7-servicing.22322.2
</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
6.0.
6-servicing.22267.7
</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>
6.0.
6
</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>
6.0.
6
</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>
6.0.
4
</MicrosoftNETCorePlatformsVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
6.0.
7-servicing.22322.2
</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>
6.0.
7
</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>
6.0.
7
</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>
6.0.
5
</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>
6.0.0
</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>
6.0.0
</SystemDirectoryServicesVersion>
<SystemReflectionMetadataLoadContextVersion>
6.0.0
</SystemReflectionMetadataLoadContextVersion>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录