Skip to content

Commit 0692302

Browse files
dotnet-botvseanreesermsft
dotnet-bot
authored and
vseanreesermsft
committed
Merged PR 38318: [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.29-servicing.24165.6 to 6.0.29-servicing.24169.15 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 6.0.29-servicing.24164.14 to 6.0.29-servicing.24169.13 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 6.0.29-servicing.24165.6 to 6.0.29-servicing.24169.15 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 6.0.29 to 6.0.29 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 6.0.29-servicing.24165.6 to 6.0.29-servicing.24169.15 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.29-servicing.24164.14 to 6.0.29-servicing.24169.13 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 6.0.29-servicing.24165.6 to 6.0.29-servicing.24169.15 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.29 to 6.0.29 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 6.0.29-servicing.24165.6 to 6.0.29-servicing.24169.15 (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**: - **Date Produced**: March 20, 2024 4:09:11 AM UTC - **Commit**: f3f959782e4e407301c19cd90dc0d1da329425bf - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 6.0.29-servicing.24168.9 to 6.0.29-servicing.24169.12][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 6.0.29-servicing.24168.9 to 6.0.29-servicing.24169.12][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 6.0.29-servicing.24168.9 to 6.0.29-servicing.24169.12][1] - **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24165.6 to 6.0.29-servicing.24169.15][2] - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 6.0.29-servicing.24164.14 to 6.0.29-servicing.24169.13][3] - **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24165.6 to 6.0.29-servicing.24169.15][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.29 to 6.0.29][3] - **Microsoft.Private.Winforms**: [from 6.0.29-servicing.24165.6 to 6.0.29-servicing.24169.15][2] ...
2 parents 7c192f4 + 20ef122 commit 0692302

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

‎NuGet.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +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-01f15d4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-01f15d48/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-c95b683" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c95b6832/nuget/v3/index.json" />
1313
<!-- End: Package sources from dotnet-runtime -->
1414
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1515
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -22,7 +22,7 @@
2222
<clear />
2323
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2424
<!-- Begin: Package sources from dotnet-runtime -->
25-
<add key="darc-int-dotnet-runtime-01f15d4" value="true" />
25+
<add key="darc-int-dotnet-runtime-c95b683" value="true" />
2626
<!-- End: Package sources from dotnet-runtime -->
2727
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2828
</disabledPackageSources>

‎eng/Version.Details.xml

Lines changed: 16 additions & 16 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.29-servicing.24164.14" CoherentParentDependency="Microsoft.Private.Winforms">
4+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="6.0.29-servicing.24169.13" CoherentParentDependency="Microsoft.Private.Winforms">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>01f15d4879bd19d518e5bfe146af3b85ccf43076</Sha>
6+
<Sha>c95b68327d40062beb0c9d4cd08295a85d86bd27</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.29-servicing.24165.6" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
8+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.29-servicing.24169.15" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>5ac05029bbfe9dc7b578ca44456fd1edc2f4507d</Sha>
10+
<Sha>8b4de777b2ddf7e0f4a06dec30bbc152315fdef8</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.29-servicing.24168.9">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="6.0.29-servicing.24169.12">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>573c73a5486beb4de70c4b628df1825540ea1d83</Sha>
14+
<Sha>f3f959782e4e407301c19cd90dc0d1da329425bf</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.29-servicing.24168.9">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="6.0.29-servicing.24169.12">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>573c73a5486beb4de70c4b628df1825540ea1d83</Sha>
18+
<Sha>f3f959782e4e407301c19cd90dc0d1da329425bf</Sha>
1919
</Dependency>
2020
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.29" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>01f15d4879bd19d518e5bfe146af3b85ccf43076</Sha>
22+
<Sha>c95b68327d40062beb0c9d4cd08295a85d86bd27</Sha>
2323
</Dependency>
24-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.29-servicing.24164.14" CoherentParentDependency="Microsoft.Private.Winforms">
24+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.29-servicing.24169.13" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>01f15d4879bd19d518e5bfe146af3b85ccf43076</Sha>
26+
<Sha>c95b68327d40062beb0c9d4cd08295a85d86bd27</Sha>
2727
</Dependency>
2828
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.29" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>01f15d4879bd19d518e5bfe146af3b85ccf43076</Sha>
30+
<Sha>c95b68327d40062beb0c9d4cd08295a85d86bd27</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.29-servicing.24165.6" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.29-servicing.24169.15" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34-
<Sha>5ac05029bbfe9dc7b578ca44456fd1edc2f4507d</Sha>
34+
<Sha>8b4de777b2ddf7e0f4a06dec30bbc152315fdef8</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.29-servicing.24168.9">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="6.0.29-servicing.24169.12">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>573c73a5486beb4de70c4b628df1825540ea1d83</Sha>
38+
<Sha>f3f959782e4e407301c19cd90dc0d1da329425bf</Sha>
3939
</Dependency>
4040
</ProductDependencies>
4141
<ToolsetDependencies>

‎eng/Versions.props

Lines changed: 6 additions & 6 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.29-servicing.24165.6</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23-
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.29-servicing.24168.9</MicrosoftDotNetWpfProjectTemplatesVersion>
22+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>6.0.29-servicing.24169.15</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23+
<MicrosoftDotNetWpfProjectTemplatesVersion>6.0.29-servicing.24169.12</MicrosoftDotNetWpfProjectTemplatesVersion>
2424
</PropertyGroup>
2525
<!--
2626
@@ -57,12 +57,12 @@
5757
<!-- runtime -->
5858
<MicrosoftNETCoreAppRefVersion>6.0.29</MicrosoftNETCoreAppRefVersion>
5959
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.29</MicrosoftNETCoreAppRuntimewinx64Version>
60-
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.29-servicing.24164.14</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
61-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.29-servicing.24164.14</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
60+
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>6.0.29-servicing.24169.13</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
61+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.29-servicing.24169.13</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
6262
<!-- winforms -->
63-
<MicrosoftPrivateWinformsVersion>6.0.29-servicing.24165.6</MicrosoftPrivateWinformsVersion>
63+
<MicrosoftPrivateWinformsVersion>6.0.29-servicing.24169.15</MicrosoftPrivateWinformsVersion>
6464
<!-- wpf -->
65-
<MicrosoftDotNetWpfGitHubVersion>6.0.29-servicing.24168.9</MicrosoftDotNetWpfGitHubVersion>
65+
<MicrosoftDotNetWpfGitHubVersion>6.0.29-servicing.24169.12</MicrosoftDotNetWpfGitHubVersion>
6666
<!-- Not auto-updated. -->
6767
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
6868
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>

0 commit comments

Comments
 (0)