Skip to content

Commit

Permalink
Merged PR 40388: [internal/release/8.0] Update dependencies from dnce…
Browse files Browse the repository at this point in the history
…ng/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 8.0.7-servicing.24311.13 to 8.0.7-servicing.24312.14 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.App.Ref**: from 8.0.7 to 8.0.7 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.7 to 8.0.7 (parent: Microsoft.Private.Winforms)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.7-servicing.24311.13 to 8.0.7-servicing.24312.14 (parent: Microsoft.Private.Winforms)
  - **System.Security.Cryptography.Xml**: from 8.0.1 to 8.0.1 (parent: Microsoft.Private.Winforms)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: 0ce99e90-7dcb-4849-5aa3-08dbd5a5c716
- **Build**: 20240613.2
- **Date Produced**: June 13, 2024 3:56:24 PM UTC
- **Commit**: bd8c5c8606471a9c43ce856d3454a1a14e2e389c
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 8.0.7-servicing.24311.4 to 8.0.7-servicing.24313.2][1]
  - **Microsoft.Private.Winforms**: [from 8.0.7-servicing.24311.4 to 8.0.7-servicing.24313.2][1]
  - **System.Drawing.Common**: [from 8.0.7 to 8.0.7][1]
  - **Microsoft.NETCore.Platforms**: [from 8.0.7-servicing.24311.13 to 8.0.7-servicing.24312.14][2]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.7 to 8.0.7][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.7 to 8.0.7][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.7-servicing.24311.13 to 8.0.7-servicing.24312.14][2]
  - **System.Security.Cryptography.Xml**: [from 8.0.1 to 8.0.1][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC706e61ff5705f6b87ecdde0d7338006eba3467c5&targetVersion=GCbd8c5c8606471a9c43ce856d3454a1a14e2e389c&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCe0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d&targetVersion=GCcc6880ce36d783678284d36e8397fc30fda93c8a&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716)
  • Loading branch information
dotnet-bot authored and vseanreesermsft committed Jun 13, 2024
2 parents b10cd0c + 0b9370c commit 28dd904
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 19 deletions.
8 changes: 4 additions & 4 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
<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-e0b6a81" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-e0b6a814/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-cc6880c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-cc6880ce-1/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-706e61f" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-706e61ff/nuget/v3/index.json" />
<add key="darc-int-dotnet-winforms-bd8c5c8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-bd8c5c86/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-winforms -->
<!--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" />
Expand All @@ -22,10 +22,10 @@
<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-e0b6a81" value="true" />
<add key="darc-int-dotnet-runtime-cc6880c-1" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-706e61f" value="true" />
<add key="darc-int-dotnet-winforms-bd8c5c8" value="true" />
<!-- End: Package sources from dotnet-winforms -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
24 changes: 12 additions & 12 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.7-servicing.24311.4">
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.7-servicing.24313.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>706e61ff5705f6b87ecdde0d7338006eba3467c5</Sha>
<Sha>bd8c5c8606471a9c43ce856d3454a1a14e2e389c</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.7-servicing.24311.4">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.7-servicing.24313.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>706e61ff5705f6b87ecdde0d7338006eba3467c5</Sha>
<Sha>bd8c5c8606471a9c43ce856d3454a1a14e2e389c</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand All @@ -17,9 +17,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.7-servicing.24311.13" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.7-servicing.24312.14" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d</Sha>
<Sha>cc6880ce36d783678284d36e8397fc30fda93c8a</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="8.0.0-rtm.24178.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
Expand All @@ -31,15 +31,15 @@
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d</Sha>
<Sha>cc6880ce36d783678284d36e8397fc30fda93c8a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d</Sha>
<Sha>cc6880ce36d783678284d36e8397fc30fda93c8a</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.7-servicing.24311.13" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.7-servicing.24312.14" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d</Sha>
<Sha>cc6880ce36d783678284d36e8397fc30fda93c8a</Sha>
</Dependency>
<!-- These dependencies are required by windowsdesktop for coherency. -->
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
Expand Down Expand Up @@ -120,7 +120,7 @@
</Dependency>
<Dependency Name="System.Security.Cryptography.Xml" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>e0b6a8149721f5d4f4bc8fe2ae8d39543a503b1d</Sha>
<Sha>cc6880ce36d783678284d36e8397fc30fda93c8a</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -152,7 +152,7 @@
</Dependency>
<Dependency Name="System.Drawing.Common" Version="8.0.7">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>706e61ff5705f6b87ecdde0d7338006eba3467c5</Sha>
<Sha>bd8c5c8606471a9c43ce856d3454a1a14e2e389c</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
6 changes: 3 additions & 3 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/winforms -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>8.0.7-servicing.24311.4</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>8.0.7-servicing.24313.2</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/runtime -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.7-servicing.24311.13</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.7-servicing.24312.14</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRefVersion>8.0.7</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.7</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>8.0.7-servicing.24311.13</MicrosoftNETCorePlatformsVersion>
<MicrosoftNETCorePlatformsVersion>8.0.7-servicing.24312.14</MicrosoftNETCorePlatformsVersion>
<SystemCodeDomPackageVersion>8.0.0</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>8.0.0</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>8.0.0</SystemDiagnosticsEventLogPackageVersion>
Expand Down

0 comments on commit 28dd904

Please sign in to comment.