Skip to content

Commit

Permalink
Merged PR 36594: [internal/release/7.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.App.Ref**: from 7.0.15 to 7.0.16 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.15 to 7.0.16 (parent: Microsoft.Private.Winforms)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29 (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**: 20240117.11
- **Date Produced**: January 18, 2024 7:20:32 AM UTC
- **Commit**: 3d504675f930028236a0f09e47c900ad48bd3d6e
- **Branch**: refs/heads/internal/release/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.16-servicing.24060.7 to 7.0.16-servicing.24067.11][1]
  - **Microsoft.Private.Winforms**: [from 7.0.16-servicing.24060.7 to 7.0.16-servicing.24067.11][1]
  - **Microsoft.NETCore.App.Ref**: [from 7.0.15 to 7.0.16][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.15 to 7.0.16][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.15-servicing.23572.26 to 7.0.16-servicing.24066.29][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GCb7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6&targetVersion=GC3d504675f930028236a0f09e47c900ad48bd3d6e&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC8f4568cdaa2f9654fd133a17cd2dcc55b5f42455&targetVersion=GC567edafe6106e6b769c64f6a2ed876190baa642a&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:99f855ec-f28a-4ad7-6638-08da7ef6346a)
  • Loading branch information
dotnet-bot authored and vseanreesermsft committed Jan 18, 2024
1 parent b05bc3d commit 4a6accd
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 20 deletions.
8 changes: 2 additions & 6 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +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-8f4568c" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8f4568cd/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-8f4568c-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8f4568cd-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-8f4568c-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8f4568cd-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-567edaf" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-567edafe/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" />
Expand All @@ -23,9 +21,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-8f4568c-1" value="true" />
<add key="darc-int-dotnet-runtime-8f4568c-2" value="true" />
<add key="darc-int-dotnet-runtime-8f4568c" value="true" />
<add key="darc-int-dotnet-runtime-567edaf" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
20 changes: 10 additions & 10 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="7.0.16-servicing.24060.7">
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.16-servicing.24067.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6</Sha>
<Sha>3d504675f930028236a0f09e47c900ad48bd3d6e</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.16-servicing.24060.7">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.16-servicing.24067.11">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>b7fa724c93e65ac40bef3e8ab05bc1a63f62b0f6</Sha>
<Sha>3d504675f930028236a0f09e47c900ad48bd3d6e</Sha>
</Dependency>
<Dependency Name="System.CodeDom" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -61,17 +61,17 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.15" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.16" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>8f4568cdaa2f9654fd133a17cd2dcc55b5f42455</Sha>
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.15" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.16" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>8f4568cdaa2f9654fd133a17cd2dcc55b5f42455</Sha>
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.15-servicing.23572.26" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.16-servicing.24066.29" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>8f4568cdaa2f9654fd133a17cd2dcc55b5f42455</Sha>
<Sha>567edafe6106e6b769c64f6a2ed876190baa642a</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/winforms -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>7.0.16-servicing.24060.7</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>7.0.16-servicing.24067.11</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/runtime -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.15-servicing.23572.26</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRefVersion>7.0.15</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.15</MicrosoftNETCoreAppRuntimewinx64Version>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.16-servicing.24066.29</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRefVersion>7.0.16</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.16</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>7.0.4</MicrosoftNETCorePlatformsVersion>
<SystemCodeDomPackageVersion>7.0.0</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>7.0.0</SystemConfigurationConfigurationManagerPackageVersion>
Expand Down

0 comments on commit 4a6accd

Please sign in to comment.