未验证 提交 fda22ac4 编写于 作者: V vseanreesermsft 提交者: GitHub

Merging internal commits for release/5.0 (#6565)

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20220405.5

Microsoft.DotNet.Wpf.DncEng
 From Version 5.0.12-servicing.22103.6 -> To Version 5.0.12-servicing.22205.5

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-winforms build 20220415.4

Microsoft.Dotnet.WinForms.ProjectTemplates , Microsoft.Private.Winforms
 From Version 5.0.16-servicing.22168.5 -> To Version 5.0.17-servicing.22215.4

Dependency coherency updates

Microsoft.NETCore.ILDAsm,Microsoft.NETCore.ILAsm,Microsoft.NETCore.App.Internal,Microsoft.NETCore.App.Runtime.win-x64
 From Version 5.0.16-servicing.22167.5 -> To Version 5.0.17-servicing.22213.14 (parent: Microsoft.Private.Winforms
Co-authored-by: NDotNet-Bot <dn-bot@microsoft.com>
上级 fd8a44af
......@@ -5,7 +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-1016676" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-10166769/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-6a98414" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-6a984143/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" />
......@@ -17,7 +17,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-1016676" value="true" />
<add key="darc-int-dotnet-runtime-6a98414" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
......
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="5.0.16-servicing.22168.5">
<Dependency Name="Microsoft.Private.Winforms" Version="5.0.17-servicing.22215.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>26f622611fe4a3a1022cbc7124c22d6c231279fd</Sha>
<Sha>b5fa2014235d377e81880060c18b2d8de4f3c73d</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.16-servicing.22168.5">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="5.0.17-servicing.22215.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>26f622611fe4a3a1022cbc7124c22d6c231279fd</Sha>
<Sha>b5fa2014235d377e81880060c18b2d8de4f3c73d</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry" Version="5.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
......@@ -77,29 +77,29 @@
<Uri>https://github.com/dotnet/coreclr</Uri>
<Sha>d5bb8bf2437d447750cf0203dd55bb5160ff36b8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="5.0.16-servicing.22167.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="5.0.17-servicing.22213.14" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>101667696659492d5cfbc662ffb05f54eb4dbc48</Sha>
<Sha>6a984143635bde23e728abaaccbde52f5ea8fa3e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.16-servicing.22167.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.ILAsm" Version="5.0.17-servicing.22213.14" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>101667696659492d5cfbc662ffb05f54eb4dbc48</Sha>
<Sha>6a984143635bde23e728abaaccbde52f5ea8fa3e</Sha>
</Dependency>
<Dependency Name="System.Resources.Extensions" Version="5.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.16-servicing.22167.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Internal" Version="5.0.17-servicing.22213.14" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>101667696659492d5cfbc662ffb05f54eb4dbc48</Sha>
<Sha>6a984143635bde23e728abaaccbde52f5ea8fa3e</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="5.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>cf258a14b70ad9069470a108f13765e0e5988f51</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.16" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="5.0.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>101667696659492d5cfbc662ffb05f54eb4dbc48</Sha>
<Sha>6a984143635bde23e728abaaccbde52f5ea8fa3e</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
......
......@@ -8,19 +8,19 @@
</PropertyGroup>
<!-- NuGet Package Versions -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>5.0.16-servicing.22168.5</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>5.0.17-servicing.22215.4</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>5.0.16-servicing.22167.5</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>5.0.16-servicing.22167.5</MicrosoftNETCoreILAsmVersion>
<MicrosoftNETCoreILDAsmVersion>5.0.17-servicing.22213.14</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>5.0.17-servicing.22213.14</MicrosoftNETCoreILAsmVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup>
<MicrosoftNETCoreAppInternalVersion>5.0.16-servicing.22167.5</MicrosoftNETCoreAppInternalVersion>
<MicrosoftNETCoreAppInternalVersion>5.0.17-servicing.22213.14</MicrosoftNETCoreAppInternalVersion>
<MicrosoftNETCoreAppRefVersion>5.0.0</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>5.0.16</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCoreAppRuntimewinx64Version>5.0.17</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>5.0.4</MicrosoftNETCorePlatformsVersion>
<SystemDrawingCommonVersion>5.0.3</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>5.0.0</SystemDirectoryServicesVersion>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册