Skip to content

Commit 397c48f

Browse files
dotnet-botdkurepa
dotnet-bot
authored and
dkurepa
committed
Merged PR 28002: [internal/release/6.0] Update dependencies 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 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][...
1 parent 4855a55 commit 397c48f

File tree

3 files changed

+28
-30
lines changed

3 files changed

+28
-30
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-runtime -->
12-
<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" />
13-
<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" />
12+
<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" />
1413
<!-- End: Package sources from dotnet-runtime -->
1514
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1615
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -23,8 +22,7 @@
2322
<clear />
2423
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2524
<!-- Begin: Package sources from dotnet-runtime -->
26-
<add key="darc-int-dotnet-runtime-02e45a4-3" value="true" />
27-
<add key="darc-int-dotnet-runtime-02e45a4" value="true" />
25+
<add key="darc-int-dotnet-runtime-1af80ba" value="true" />
2826
<!-- End: Package sources from dotnet-runtime -->
2927
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3028
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.12-servicing.22568.7" CoherentParentDependency="Microsoft.Private.Winforms">
4+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.13-servicing.22580.9" CoherentParentDependency="Microsoft.Private.Winforms">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>02e45a41b756dd147fc39297df7649d86fa245e7</Sha>
6+
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.13-servicing.22579.11" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
8+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.13-servicing.22601.1" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>bd7407606f49c7bb9ee784c5a5a9c19127c0f081</Sha>
10+
<Sha>5a262a681e41941ea7ef42f49c0ed3b27a05c259</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.13-servicing.22580.2">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.13-servicing.22601.5">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>9601ea7b0314d236be4e8dd482e0cc9222e95156</Sha>
14+
<Sha>4ba96971b81698ec17061cbd6a59f752f5bfc3b5</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.13-servicing.22580.2">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.13-servicing.22601.5">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>9601ea7b0314d236be4e8dd482e0cc9222e95156</Sha>
18+
<Sha>4ba96971b81698ec17061cbd6a59f752f5bfc3b5</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.12" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.13" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>02e45a41b756dd147fc39297df7649d86fa245e7</Sha>
22+
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
2323
</Dependency>
24-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.12-servicing.22568.7" CoherentParentDependency="Microsoft.Private.Winforms">
24+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.13-servicing.22580.9" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>02e45a41b756dd147fc39297df7649d86fa245e7</Sha>
26+
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.12" CoherentParentDependency="Microsoft.Private.Winforms">
28+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.13" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>02e45a41b756dd147fc39297df7649d86fa245e7</Sha>
30+
<Sha>1af80ba017f6f7644305e1781d8cc9845a92b5f8</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.13-servicing.22579.11" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.13-servicing.22601.1" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34-
<Sha>bd7407606f49c7bb9ee784c5a5a9c19127c0f081</Sha>
34+
<Sha>5a262a681e41941ea7ef42f49c0ed3b27a05c259</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.13-servicing.22580.2">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.13-servicing.22601.5">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>9601ea7b0314d236be4e8dd482e0cc9222e95156</Sha>
38+
<Sha>4ba96971b81698ec17061cbd6a59f752f5bfc3b5</Sha>
3939
</Dependency>
4040
</ProductDependencies>
4141
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<NETCoreAppMaximumVersion>6.0</NETCoreAppMaximumVersion>
2020
<NETCoreAppFrameworkVersion>6.0</NETCoreAppFrameworkVersion>
2121
<NETCoreAppFramework>net$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
22-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.13-servicing.22579.11</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23-
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.13-servicing.22580.2</MicrosoftDotNetWpfProjectTemplatesVersion>
22+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.13-servicing.22601.1</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23+
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.13-servicing.22601.5</MicrosoftDotNetWpfProjectTemplatesVersion>
2424
</PropertyGroup>
2525
<!--
2626
@@ -55,14 +55,14 @@
5555
<MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.22561.1</MicrosoftDotNetBuildTasksInstallersVersion>
5656
<MicrosoftDotNetVersionToolsTasksVersion>6.0.0-beta.22561.1</MicrosoftDotNetVersionToolsTasksVersion>
5757
<!-- runtime -->
58-
<MicrosoftNETCoreAppRefVersion>6.0.12</MicrosoftNETCoreAppRefVersion>
59-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.12</MicrosoftNETCoreAppRuntimewinx64Version>
60-
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.12-servicing.22568.7</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
61-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.12-servicing.22568.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
58+
<MicrosoftNETCoreAppRefVersion>6.0.13</MicrosoftNETCoreAppRefVersion>
59+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.13</MicrosoftNETCoreAppRuntimewinx64Version>
60+
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.13-servicing.22580.9</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
61+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.13-servicing.22580.9</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
6262
<!-- winforms -->
63-
<MicrosoftPrivateWinformsVersion>6.0.13-servicing.22579.11</MicrosoftPrivateWinformsVersion>
63+
<MicrosoftPrivateWinformsVersion>6.0.13-servicing.22601.1</MicrosoftPrivateWinformsVersion>
6464
<!-- wpf -->
65-
<MicrosoftDotNetWpfGitHubVersion>6.0.13-servicing.22580.2</MicrosoftDotNetWpfGitHubVersion>
65+
<MicrosoftDotNetWpfGitHubVersion>6.0.13-servicing.22601.5</MicrosoftDotNetWpfGitHubVersion>
6666
<!-- Not auto-updated. -->
6767
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
6868
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>

0 commit comments

Comments
 (0)