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

Merged PR 31527: [internal/release/7.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 7.0.2 to 7.0.3 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.Private.Winforms)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4 (parent: Microsoft.Private.Winforms)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:99f855ec-f28a-4ad7-6638-08da7ef6346a)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: 99f855ec-f28a-4ad7-6638-08da7ef6346a
- **Build**: 20230524.5
- **Date Produced**: May 24, 2023 9:28:48 PM UTC
- **Commit**: b4a5f0c6839363dea534f21736a9d0726c14b41c
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5][1]
  - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23272.2 to 7.0.7-servicing.23274.5][1]
  - **Microsoft.NETCore.Platforms**: [from 7.0.2 to 7.0.3][2]
  - **Microsoft.NETCore.App.Ref**: [from 7.0.7 to 7.0.7][3]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.7 to 7.0.7][3]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.7-servicing.23269.6 to 7.0.7-servicing.23274.4][3]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCe3bf366a73&targetVersion=GCb4a5f0c683&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC8042d61b17&targetVersion=GC5b20af47d9&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC8e3442dd52&targetVersion=GC5b20af47d9&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:99f855ec-f28a-4ad7-6638-08da7ef6346a)
上级 24923547
...@@ -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-8e3442d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8e3442dd/nuget/v3/index.json" /> <add key="darc-int-dotnet-runtime-5b20af4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5b20af47/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" />
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,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-8e3442d" value="true" /> <add key="darc-int-dotnet-runtime-5b20af4" 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="7.0.7-servicing.23272.2"> <Dependency Name="Microsoft.Private.Winforms" Version="7.0.7-servicing.23274.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>e3bf366a7361267ba472521190d62c9d22f39b14</Sha> <Sha>b4a5f0c6839363dea534f21736a9d0726c14b41c</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.7-servicing.23272.2"> <Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.7-servicing.23274.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>e3bf366a7361267ba472521190d62c9d22f39b14</Sha> <Sha>b4a5f0c6839363dea534f21736a9d0726c14b41c</Sha>
</Dependency> </Dependency>
<Dependency Name="System.CodeDom" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="System.CodeDom" Version="7.0.0" 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>
...@@ -45,9 +45,9 @@ ...@@ -45,9 +45,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha> <Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.2" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="Microsoft.NETCore.Platforms" Version="7.0.3" 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>8042d61b17540e49e53569e3728d2faa1c596583</Sha> <Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="7.0.0-rtm.23211.2"> <Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="7.0.0-rtm.23211.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri> <Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
...@@ -63,15 +63,15 @@ ...@@ -63,15 +63,15 @@
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.7" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.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>8e3442dd52923615959c161ce49b9960375ea07b</Sha> <Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
</Dependency> </Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.7" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.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>8e3442dd52923615959c161ce49b9960375ea07b</Sha> <Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
</Dependency> </Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.7-servicing.23269.6" CoherentParentDependency="Microsoft.Private.Winforms"> <Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.7-servicing.23274.4" 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>8e3442dd52923615959c161ce49b9960375ea07b</Sha> <Sha>5b20af47d99620150c53eaf5db8636fdf730b126</Sha>
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
......
...@@ -22,14 +22,14 @@ ...@@ -22,14 +22,14 @@
</PropertyGroup> </PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/winforms --> <!-- Packages that come from https://github.com/dotnet/winforms -->
<PropertyGroup> <PropertyGroup>
<MicrosoftPrivateWinformsVersion>7.0.7-servicing.23272.2</MicrosoftPrivateWinformsVersion> <MicrosoftPrivateWinformsVersion>7.0.7-servicing.23274.5</MicrosoftPrivateWinformsVersion>
</PropertyGroup> </PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/runtime --> <!-- Packages that come from https://github.com/dotnet/runtime -->
<PropertyGroup> <PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.7-servicing.23269.6</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion> <VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.7-servicing.23274.4</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRefVersion>7.0.7</MicrosoftNETCoreAppRefVersion> <MicrosoftNETCoreAppRefVersion>7.0.7</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.7</MicrosoftNETCoreAppRuntimewinx64Version> <MicrosoftNETCoreAppRuntimewinx64Version>7.0.7</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>7.0.2</MicrosoftNETCorePlatformsVersion> <MicrosoftNETCorePlatformsVersion>7.0.3</MicrosoftNETCorePlatformsVersion>
<SystemCodeDomPackageVersion>7.0.0</SystemCodeDomPackageVersion> <SystemCodeDomPackageVersion>7.0.0</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>7.0.0</SystemConfigurationConfigurationManagerPackageVersion> <SystemConfigurationConfigurationManagerPackageVersion>7.0.0</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>7.0.0</SystemDiagnosticsEventLogPackageVersion> <SystemDiagnosticsEventLogPackageVersion>7.0.0</SystemDiagnosticsEventLogPackageVersion>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册