Skip to content

Commit

Permalink
Merged PR 32064: [internal/release/6.0] Update dependencies from dnce…
Browse files Browse the repository at this point in the history
…ng/internal/dotnet-wpf

This pull request updates the following dependencies

[marker]: <> (Begin:5b48321b-d791-47a4-da08-08d961c27f17)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- **Subscription**: 5b48321b-d791-47a4-da08-08d961c27f17
- **Build**: 20230621.5
- **Date Produced**: June 21, 2023 4:27:02 PM UTC
- **Commit**: 6298294127ccd64bc544dae38d09a4cd6be1d7a0
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Wpf.GitHub**: [from 6.0.19-servicing.23316.8 to 6.0.20-servicing.23321.5][2]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.19-servicing.23316.8 to 6.0.20-servicing.23321.5][2]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.19-servicing.23316.8 to 6.0.20-servicing.23321.5][2]
  - **Microsoft.Private.Winforms**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][3]
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][4]
  - **Microsoft.Private.Winforms**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][3]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.19 to 6.0.20][4]
  - **Microsoft.Private.Winforms**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][3]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][4]
  - **Microsoft.Private.Winforms**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][3]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.19 to 6.0.20][4]
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][3]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GCb2fc6c7933&targetVersion=GC6298294127&_a=files
[3]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC4e9cc74519&targetVersion=GC2536781675&_a=files
[4]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCfcf11495c6&targetVersion=GCa08d9ce2ca&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:5b48321b-d791-47a4-da08-08d961c27f17)

[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 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 6.0.19-servicing.2331...
  • Loading branch information
dotnet-bot authored and mmitche committed Jun 21, 2023
1 parent 2c767e3 commit be36537
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions NuGet.config
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-fcf1149" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fcf11495/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-a08d9ce" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a08d9ce2/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 @@ -22,7 +22,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-fcf1149" value="true" />
<add key="darc-int-dotnet-runtime-a08d9ce" 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
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="6.0.19-servicing.23313.25" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.20-servicing.23320.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.19-servicing.23316.2" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.20-servicing.23320.10" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>4e9cc74519c57c5c4913459618f0dab2d6696ea1</Sha>
<Sha>2536781675df3fe4848e96605b0ee852fe3ee91b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.19-servicing.23316.8">
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.20-servicing.23321.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0</Sha>
<Sha>6298294127ccd64bc544dae38d09a4cd6be1d7a0</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.19-servicing.23316.8">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.20-servicing.23321.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0</Sha>
<Sha>6298294127ccd64bc544dae38d09a4cd6be1d7a0</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.19" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.20" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.19-servicing.23313.25" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.20-servicing.23320.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.19" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.20" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.19-servicing.23316.2" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.20-servicing.23320.10" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>4e9cc74519c57c5c4913459618f0dab2d6696ea1</Sha>
<Sha>2536781675df3fe4848e96605b0ee852fe3ee91b</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.19-servicing.23316.8">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.20-servicing.23321.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>b2fc6c7933d7c0e1f1b35e9df0356d2bb24b93d0</Sha>
<Sha>6298294127ccd64bc544dae38d09a4cd6be1d7a0</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
16 changes: 8 additions & 8 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<NETCoreAppMaximumVersion>6.0</NETCoreAppMaximumVersion>
<NETCoreAppFrameworkVersion>6.0</NETCoreAppFrameworkVersion>
<NETCoreAppFramework>net$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.19-servicing.23316.2</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.19-servicing.23316.8</MicrosoftDotNetWpfProjectTemplatesVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.20-servicing.23320.10</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.20-servicing.23321.5</MicrosoftDotNetWpfProjectTemplatesVersion>
</PropertyGroup>
<!--
Expand Down Expand Up @@ -55,14 +55,14 @@
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.23313.5</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.23313.5</MicrosoftDotNetVersionToolsTasksVersion>
<!-- runtime -->
<MicrosoftNETCoreAppRefVersion>6.0.19</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.19</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.19-servicing.23313.25</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.19-servicing.23313.25</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.20</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.20</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.20-servicing.23320.17</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.20-servicing.23320.17</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<!-- winforms -->
<MicrosoftPrivateWinformsVersion>6.0.19-servicing.23316.2</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.20-servicing.23320.10</MicrosoftPrivateWinformsVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubVersion>6.0.19-servicing.23316.8</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfGitHubVersion>6.0.20-servicing.23321.5</MicrosoftDotNetWpfGitHubVersion>
<!-- Not auto-updated. -->
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
Expand Down

0 comments on commit be36537

Please sign in to comment.