Skip to content

Commit

Permalink
Merged PR 36582: [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.1-servicing.23580.1 to 8.0.2-servicing.24065.5 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.App.Ref**: from 8.0.1 to 8.0.2 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 8.0.1 to 8.0.2 (parent: Microsoft.Private.Winforms)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24065.5 (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**: 20240117.6
- **Date Produced**: January 18, 2024 1:22:08 AM UTC
- **Commit**: 9d26f5869a1c6b5af54037358910543ad9f132ff
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24067.6][1]
  - **Microsoft.Private.Winforms**: [from 8.0.2-servicing.24060.4 to 8.0.2-servicing.24067.6][1]
  - **System.Drawing.Common**: [from 8.0.2 to 8.0.2][1]
  - **Microsoft.NETCore.Platforms**: [from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24065.5][2]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.1 to 8.0.2][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.1 to 8.0.2][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.1-servicing.23580.1 to 8.0.2-servicing.24065.5][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC35307d0f7a7381a850bde13723241862ba824b3f&targetVersion=GC9d26f5869a1c6b5af54037358910543ad9f132ff&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCbf5e279d9239bfef5bb1b8d6212f1b971c434606&targetVersion=GC806d04b02e42254b0be9b0b85119f3e9133462bd&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:0ce99e90-7dcb-4849-5aa3-08dbd5a5c716)
  • Loading branch information
dotnet-bot authored and vseanreesermsft committed Jan 18, 2024
1 parent 4c5c251 commit f03aef0
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 26 deletions.
12 changes: 4 additions & 8 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +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-bf5e279" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bf5e279d/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-bf5e279-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bf5e279d-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-bf5e279-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bf5e279d-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-806d04b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-806d04b0/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-35307d0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-35307d0f/nuget/v3/index.json" />
<add key="darc-int-dotnet-winforms-9d26f58" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-9d26f586/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 @@ -24,12 +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-bf5e279-1" value="true" />
<add key="darc-int-dotnet-runtime-bf5e279-2" value="true" />
<add key="darc-int-dotnet-runtime-bf5e279" value="true" />
<add key="darc-int-dotnet-runtime-806d04b" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-35307d0" value="true" />
<add key="darc-int-dotnet-winforms-9d26f58" 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
26 changes: 13 additions & 13 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.2-servicing.24060.4">
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.2-servicing.24067.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>35307d0f7a7381a850bde13723241862ba824b3f</Sha>
<Sha>9d26f5869a1c6b5af54037358910543ad9f132ff</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.2-servicing.24060.4">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.2-servicing.24067.6">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>35307d0f7a7381a850bde13723241862ba824b3f</Sha>
<Sha>9d26f5869a1c6b5af54037358910543ad9f132ff</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.1-servicing.23580.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.2-servicing.24065.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>bf5e279d9239bfef5bb1b8d6212f1b971c434606</Sha>
<Sha>806d04b02e42254b0be9b0b85119f3e9133462bd</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="8.0.0-rtm.23569.1">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
Expand All @@ -29,17 +29,17 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>bf5e279d9239bfef5bb1b8d6212f1b971c434606</Sha>
<Sha>806d04b02e42254b0be9b0b85119f3e9133462bd</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>bf5e279d9239bfef5bb1b8d6212f1b971c434606</Sha>
<Sha>806d04b02e42254b0be9b0b85119f3e9133462bd</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.1-servicing.23580.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.2-servicing.24065.5" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>bf5e279d9239bfef5bb1b8d6212f1b971c434606</Sha>
<Sha>806d04b02e42254b0be9b0b85119f3e9133462bd</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 @@ -152,7 +152,7 @@
</Dependency>
<Dependency Name="System.Drawing.Common" Version="8.0.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>35307d0f7a7381a850bde13723241862ba824b3f</Sha>
<Sha>9d26f5869a1c6b5af54037358910543ad9f132ff</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
10 changes: 5 additions & 5 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.2-servicing.24060.4</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>8.0.2-servicing.24067.6</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/runtime -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.1-servicing.23580.1</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRefVersion>8.0.1</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.1</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>8.0.1-servicing.23580.1</MicrosoftNETCorePlatformsVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.2-servicing.24065.5</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRefVersion>8.0.2</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.2</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>8.0.2-servicing.24065.5</MicrosoftNETCorePlatformsVersion>
<SystemCodeDomPackageVersion>8.0.0</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>8.0.0</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>8.0.0</SystemDiagnosticsEventLogPackageVersion>
Expand Down

0 comments on commit f03aef0

Please sign in to comment.