Skip to content

Commit

Permalink
Merged PR 28002: [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: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.13-servicing.22579.11 to 6.0.13-servicing.22601.1 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Ref**: from 6.0.12 to 6.0.13 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Private.Winforms**: from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1 (parent: Microsoft.DotNet.Wpf.GitHub)
  - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.12 to 6.0.13 (parent: Microsoft.Private.Winforms)
  - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1 (parent: Microsoft.DotNet.Wpf.GitHub)

[DependencyUpdate]: <> (End)

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

[marker]: <> (Begin:5b48321b-d791-47a4-da08-08d961c27f17)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf
- **Subscription**: 5b48321b-d791-47a4-da08-08d961c27f17
- **Build**: 20221201.5
- **Date Produced**: December 1, 2022 2:47:54 PM UTC
- **Commit**: 4ba96971b81698ec17061cbd6a59f752f5bfc3b5
- **Branch**: refs/heads/internal/release/6.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.DotNet.Wpf.GitHub**: [from 6.0.13-servicing.22580.2 to 6.0.13-servicing.22601.5][1]
  - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.13-servicing.22580.2 to 6.0.13-servicing.22601.5][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.13-servicing.22580.2 to 6.0.13-servicing.22601.5][1]
  - **Microsoft.Private.Winforms**: [from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1][2]
  - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 6.0.12-servicing.22568.7 to 6.0.13-servicing.22580.9][3]
  - **Microsoft.Private.Winforms**: [from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1][2]
  - **Microsoft.NETCore.App.Ref**: [from 6.0.12 to 6.0.13][3]
  - **Microsoft.Private.Winforms**: [from 6.0.13-servicing.22579.11 to 6.0.13-servicing.22601.1][...
  • Loading branch information
dotnet-bot authored and dkurepa committed Dec 1, 2022
1 parent 4855a55 commit 397c48f
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 30 deletions.
6 changes: 2 additions & 4 deletions NuGet.config
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +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-02e45a4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-02e45a41/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-02e45a4-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-02e45a41-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-1af80ba" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1af80ba0/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,8 +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-02e45a4-3" value="true" />
<add key="darc-int-dotnet-runtime-02e45a4" value="true" />
<add key="darc-int-dotnet-runtime-1af80ba" 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.12-servicing.22568.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.13-servicing.22580.9" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>02e45a41b756dd147fc39297df7649d86fa245e7</Sha>
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.13-servicing.22579.11" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.13-servicing.22601.1" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>bd7407606f49c7bb9ee784c5a5a9c19127c0f081</Sha>
<Sha>5a262a681e41941ea7ef42f49c0ed3b27a05c259</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.13-servicing.22580.2">
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.13-servicing.22601.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>9601ea7b0314d236be4e8dd482e0cc9222e95156</Sha>
<Sha>4ba96971b81698ec17061cbd6a59f752f5bfc3b5</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.13-servicing.22580.2">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.13-servicing.22601.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>9601ea7b0314d236be4e8dd482e0cc9222e95156</Sha>
<Sha>4ba96971b81698ec17061cbd6a59f752f5bfc3b5</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.13" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>02e45a41b756dd147fc39297df7649d86fa245e7</Sha>
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.12-servicing.22568.7" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.13-servicing.22580.9" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>02e45a41b756dd147fc39297df7649d86fa245e7</Sha>
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.12" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.13" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>02e45a41b756dd147fc39297df7649d86fa245e7</Sha>
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.13-servicing.22579.11" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.13-servicing.22601.1" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>bd7407606f49c7bb9ee784c5a5a9c19127c0f081</Sha>
<Sha>5a262a681e41941ea7ef42f49c0ed3b27a05c259</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.13-servicing.22580.2">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.13-servicing.22601.5">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>9601ea7b0314d236be4e8dd482e0cc9222e95156</Sha>
<Sha>4ba96971b81698ec17061cbd6a59f752f5bfc3b5</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.13-servicing.22579.11</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.13-servicing.22580.2</MicrosoftDotNetWpfProjectTemplatesVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.13-servicing.22601.1</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.13-servicing.22601.5</MicrosoftDotNetWpfProjectTemplatesVersion>
</PropertyGroup>
<!--
Expand Down Expand Up @@ -55,14 +55,14 @@
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22561.1</MicrosoftDotNetBuildTasksInstallersVersion>
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22561.1</MicrosoftDotNetVersionToolsTasksVersion>
<!-- runtime -->
<MicrosoftNETCoreAppRefVersion>6.0.12</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.12</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.12-servicing.22568.7</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.12-servicing.22568.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<MicrosoftNETCoreAppRefVersion>6.0.13</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.13</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.13-servicing.22580.9</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.13-servicing.22580.9</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
<!-- winforms -->
<MicrosoftPrivateWinformsVersion>6.0.13-servicing.22579.11</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>6.0.13-servicing.22601.1</MicrosoftPrivateWinformsVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubVersion>6.0.13-servicing.22580.2</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfGitHubVersion>6.0.13-servicing.22601.5</MicrosoftDotNetWpfGitHubVersion>
<!-- Not auto-updated. -->
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>
Expand Down

0 comments on commit 397c48f

Please sign in to comment.