Skip to content

Commit

Permalink
Merged PR 34021: [internal/release/frameshift/7.0] Update dependencie…
Browse files Browse the repository at this point in the history 
…s from dnceng/internal/dotnet-wpf

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.Private.Winforms**: from 7.0.10-servicing.23364.5 to 7.0.12-servicing.23478.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 7.0.10-servicing.23363.12 to 7.0.12-servicing.23477.20 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 7.0.10-servicing.23364.5 to 7.0.12-servicing.23478.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Ref**: from 7.0.10 to 7.0.12 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 7.0.10-servicing.23364.5 to 7.0.12-servicing.23478.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **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)
  - **Microsoft.Private.Winforms**: from 7.0.10-servicing.23364.5 to 7.0.12-servicing.23478.3 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.10 to 7.0.12 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.10-servicing.23364.5 to 7.0.12-servicing.23478.3 (parent: Microsoft.DotNet.Wpf.GitHub)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:3cc9859e-08e9-4c6c-5549-08dbbf92ebfa)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- **Subscription**: 3cc9859e-08e9-4c6c-5549-08dbbf92ebfa
- **Build**: 20230928.2
- **Date Produced**: September 28, 2023 5:53:36 PM UTC
- **Commit**: c94bac748138456f4feef271b3dc18e4b46453e6
- **Branch**: refs/heads/internal/release/frameshift/7.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Wpf.GitHub**: [from 7.0.10-servicing.23364.4 to 7.0.12-servicing.23478.2][1]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.10-servicing.23364.4 to 7.0.12-servicing.23478.2][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.10-servicing.23364.4 to 7.0.12-servicing.23478.2][1]
  - **Microsoft.Private.Winforms**: [from 7.0.10-servicing.23364.5 to 7.0.12-servicing.23478.3][2]
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.10-servicing.23363.12 to 7.0.12-servicing.23477.20][3]
  - **Microsoft.Private.Winforms**: [from 7.0.10-servicing.23364.5 to 7.0.12-servicing.23478.3][2]
  - **Microsoft.NETCore.App.Ref**: [from 7.0.10 to 7.0.12][3]
  - **Microsoft.Private.Winforms**: [from 7.0.10-servicing.23364.5 to 7.0.12-servicin...
  • Loading branch information
@dotnet-bot @vseanreesermsft
dotnet-bot authored and vseanreesermsft committed Sep 28, 2023
2 parents e32f2c9 + e4c0e8d commit 018db42
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions NuGet.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,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-a6dbb80" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a6dbb800/nuget/v3/index.json" />
<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 @@ -24,7 +24,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-a6dbb80" value="true" />
<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
36 changes: 18 additions & 18 deletions eng/Version.Details.xml
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.10-servicing.23363.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" 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>
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.10-servicing.23364.5" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.12-servicing.23478.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>1f1ac283c5d3bb3302111f8aef567a3541863c49</Sha>
<Sha>75eafed7999075bca879940ad0b1a0794061ddb0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.10-servicing.23364.4">
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.12-servicing.23478.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha>
<Sha>c94bac748138456f4feef271b3dc18e4b46453e6</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.10-servicing.23364.4">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.12-servicing.23478.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha>
<Sha>c94bac748138456f4feef271b3dc18e4b46453e6</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="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>
<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="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.10-servicing.23364.5" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.12-servicing.23478.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>1f1ac283c5d3bb3302111f8aef567a3541863c49</Sha>
<Sha>75eafed7999075bca879940ad0b1a0794061ddb0</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.10-servicing.23364.4">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.12-servicing.23478.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>9a9892f5204f1a1b31ab2c81b025d6e35e0f3693</Sha>
<Sha>c94bac748138456f4feef271b3dc18e4b46453e6</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
16 changes: 8 additions & 8 deletions eng/Versions.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<NETCoreAppMaximumVersion>7.0</NETCoreAppMaximumVersion>
<NETCoreAppFrameworkVersion>7.0</NETCoreAppFrameworkVersion>
<NETCoreAppFramework>net$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.10-servicing.23364.5</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.10-servicing.23364.4</MicrosoftDotNetWpfProjectTemplatesVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.12-servicing.23478.3</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.12-servicing.23478.2</MicrosoftDotNetWpfProjectTemplatesVersion>
</PropertyGroup>
<!--Package versions-->
<PropertyGroup>
Expand All @@ -30,14 +30,14 @@
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23408.3</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23408.3</MicrosoftDotNetVersionToolsTasksVersion>
<!-- runtime -->
<MicrosoftNETCoreAppRefVersion>7.0.10</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.10</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.10-servicing.23363.12</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.10-servicing.23363.12</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<MicrosoftNETCoreAppRefVersion>7.0.12</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.12</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.12-servicing.23477.20</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.12-servicing.23477.20</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
<!-- winforms -->
<MicrosoftPrivateWinformsVersion>7.0.10-servicing.23364.5</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>7.0.12-servicing.23478.3</MicrosoftPrivateWinformsVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubVersion>7.0.10-servicing.23364.4</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfGitHubVersion>7.0.12-servicing.23478.2</MicrosoftDotNetWpfGitHubVersion>
<!-- Not auto-updated. -->
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
Expand Down

0 comments on commit 018db42

Please sign in to comment.