提交 a29a62bc 编写于 作者: D DotNet Bot 提交者: Matt Mitchell

Merged PR 31444: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NETCore.Platforms**: from 6.0.10 to 6.0.10 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.ILDAsm**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.ILAsm**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.App.Ref**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.18 to 6.0.18 (parent: Microsoft.Private.Winforms)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7 (parent: Microsoft.Private.Winforms)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81
- **Build**: 20230522.1
- **Date Produced**: May 22, 2023 2:50:17 PM UTC
- **Commit**: 865895cec5e8dc357b65c98a4a7af58643d10997
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][1]
  - **Microsoft.Private.Winforms**: [from 6.0.18-servicing.23268.8 to 6.0.18-servicing.23272.1][1]
  - **Microsoft.NETCore.Platforms**: [from 6.0.10 to 6.0.10][2]
  - **Microsoft.NETCore.ILDAsm**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2]
  - **Microsoft.NETCore.ILAsm**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.18 to 6.0.18][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.18 to 6.0.18][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.18-servicing.23268.3 to 6.0.18-servicing.23269.7][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC9e5f193ed6&targetVersion=GC865895cec5&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC01f26a7417&targetVersion=GCc76ac56549&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
上级 7cd35b16
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<clear /> <clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-01f26a7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-01f26a74/nuget/v3/index.json" /> <add key="darc-int-dotnet-runtime-c76ac56" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c76ac565/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--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" /> <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<disabledPackageSources> <disabledPackageSources>
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.--> <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime --> <!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-01f26a7" value="true" /> <add key="darc-int-dotnet-runtime-c76ac56" value="true" />
<!-- End: Package sources from dotnet-runtime --> <!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.--> <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources> </disabledPackageSources>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Dependencies> <Dependencies>
<ProductDependencies> <ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.18-servicing.23268.8"> <Dependency Name="Microsoft.Private.Winforms" Version="6.0.18-servicing.23272.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>9e5f193ed61f002d5d870df9c8b0b5e880fa595c</Sha> <Sha>865895cec5e8dc357b65c98a4a7af58643d10997</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.18-servicing.23268.8"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.18-servicing.23272.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>9e5f193ed61f002d5d870df9c8b0b5e880fa595c</Sha> <Sha>865895cec5e8dc357b65c98a4a7af58643d10997</Sha>
</Dependency> </Dependency>
<Dependency Name="System.CodeDom" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="System.CodeDom" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.10" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.10" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>01f26a741717461d8a311f4a1ee72e64565172aa</Sha> <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rtm.23212.3"> <Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rtm.23212.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
...@@ -57,13 +57,13 @@ ...@@ -57,13 +57,13 @@
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha> <Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.18-servicing.23268.3" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.18-servicing.23269.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>01f26a741717461d8a311f4a1ee72e64565172aa</Sha> <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.18-servicing.23268.3" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.18-servicing.23269.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>01f26a741717461d8a311f4a1ee72e64565172aa</Sha> <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
</Dependency> </Dependency>
<Dependency Name="System.Resources.Extensions" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="System.Resources.Extensions" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://github.com/dotnet/runtime</Uri> <Uri>https://github.com/dotnet/runtime</Uri>
...@@ -71,15 +71,15 @@ ...@@ -71,15 +71,15 @@
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.18" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.18" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>01f26a741717461d8a311f4a1ee72e64565172aa</Sha> <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.18" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.18" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>01f26a741717461d8a311f4a1ee72e64565172aa</Sha> <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.18-servicing.23268.3" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.18-servicing.23269.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>01f26a741717461d8a311f4a1ee72e64565172aa</Sha> <Sha>c76ac565499f3e7c657126d46c00b67a0d74832c</Sha>
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
......
...@@ -26,17 +26,17 @@ ...@@ -26,17 +26,17 @@
</PropertyGroup> </PropertyGroup>
<!-- NuGet Package Versions --> <!-- NuGet Package Versions -->
<PropertyGroup> <PropertyGroup>
<MicrosoftPrivateWinformsVersion>6.0.18-servicing.23268.8</MicrosoftPrivateWinformsVersion> <MicrosoftPrivateWinformsVersion>6.0.18-servicing.23272.1</MicrosoftPrivateWinformsVersion>
</PropertyGroup> </PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/coreclr --> <!-- Packages that come from https://github.com/dotnet/coreclr -->
<PropertyGroup> <PropertyGroup>
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion> <MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
<MicrosoftNETCoreILDAsmVersion>6.0.18-servicing.23268.3</MicrosoftNETCoreILDAsmVersion> <MicrosoftNETCoreILDAsmVersion>6.0.18-servicing.23269.7</MicrosoftNETCoreILDAsmVersion>
<MicrosoftNETCoreILAsmVersion>6.0.18-servicing.23268.3</MicrosoftNETCoreILAsmVersion> <MicrosoftNETCoreILAsmVersion>6.0.18-servicing.23269.7</MicrosoftNETCoreILAsmVersion>
</PropertyGroup> </PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/core-setup --> <!-- Packages that come from https://github.com/dotnet/core-setup -->
<PropertyGroup> <PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.18-servicing.23268.3</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion> <VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.18-servicing.23269.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.18</MicrosoftNETCoreAppRefVersion> <MicrosoftNETCoreAppRefVersion>6.0.18</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.18</MicrosoftNETCoreAppRuntimewinx64Version> <MicrosoftNETCoreAppRuntimewinx64Version>6.0.18</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>6.0.10</MicrosoftNETCorePlatformsVersion> <MicrosoftNETCorePlatformsVersion>6.0.10</MicrosoftNETCorePlatformsVersion>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册