Skip to content

Commit

Permalink
Merged PR 34014: [internal/release/frameshift/7.0] Update dependencie…
Browse files Browse the repository at this point in the history
…s 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.App.Ref**: from 7.0.10 to 7.0.12 (parent: Microsoft.Private.Winforms)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.10 to 7.0.12 (parent: Microsoft.Private.Winforms)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.10-servicing.23363.12 to 7.0.12-servicing.23477.20 (parent: Microsoft.Private.Winforms)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:e6a1c617-bce4-4274-f44d-08dbbf39d6ab)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms
- **Subscription**: e6a1c617-bce4-4274-f44d-08dbbf39d6ab
- **Build**: 20230928.3
- **Date Produced**: September 28, 2023 2:30:28 PM UTC
- **Commit**: 75eafed7999075bca879940ad0b1a0794061ddb0
- **Branch**: refs/heads/internal/release/frameshift/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 7.0.10-servicing.23364.5 to 7.0.12-servicing.23478.3][1]
  - **Microsoft.Private.Winforms**: [from 7.0.10-servicing.23364.5 to 7.0.12-servicing.23478.3][1]
  - **Microsoft.NETCore.App.Ref**: [from 7.0.10 to 7.0.12][2]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 7.0.10 to 7.0.12][2]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.10-servicing.23363.12 to 7.0.12-servicing.23477.20][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1f1ac283c5&targetVersion=GC75eafed799&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCa6dbb800a4&targetVersion=GC4a824ef37c&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:e6a1c617-bce4-4274-f44d-08dbbf39d6ab)
  • Loading branch information
dotnet-bot authored and vseanreesermsft committed Sep 28, 2023
2 parents 1c308a8 + de8268b commit c94bac7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
2 changes: 2 additions & 0 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +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-4a824ef" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4a824ef3/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 @@ -20,6 +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-4a824ef" 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.10-servicing.23364.5">
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.12-servicing.23478.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>1f1ac283c5d3bb3302111f8aef567a3541863c49</Sha>
<Sha>75eafed7999075bca879940ad0b1a0794061ddb0</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.10-servicing.23364.5">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.12-servicing.23478.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>1f1ac283c5d3bb3302111f8aef567a3541863c49</Sha>
<Sha>75eafed7999075bca879940ad0b1a0794061ddb0</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.10" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha>
<Sha>4a824ef37caa51072221584c64cbf15455f406ca</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.10" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha>
<Sha>4a824ef37caa51072221584c64cbf15455f406ca</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.10-servicing.23363.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.12-servicing.23477.20" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>a6dbb800a47735bde43187350fd3aff4071c7f9c</Sha>
<Sha>4a824ef37caa51072221584c64cbf15455f406ca</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.10-servicing.23364.5</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>7.0.12-servicing.23478.3</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/runtime -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.10-servicing.23363.12</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRefVersion>7.0.10</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.10</MicrosoftNETCoreAppRuntimewinx64Version>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.12-servicing.23477.20</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRefVersion>7.0.12</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.12</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>7.0.4</MicrosoftNETCorePlatformsVersion>
<SystemCodeDomPackageVersion>7.0.0</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>7.0.0</SystemConfigurationConfigurationManagerPackageVersion>
Expand Down

0 comments on commit c94bac7

Please sign in to comment.