Skip to content

Commit 2f39602

Browse files
dotnet-botmmitche
dotnet-bot
authored and
mmitche
committed
Merged PR 31460: [internal/release/7.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 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23269.6 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 7.0.7 to 7.0.7 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23269.6 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.7 to 7.0.7 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2 (parent: Microsoft.DotNet.Wpf.GitHub) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:763b3cc5-38c8-458a-6639-08da7ef6346a) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-wpf - **Subscription**: 763b3cc5-38c8-458a-6639-08da7ef6346a - **Build**: 20230522.4 - **Date Produced**: May 22, 2023 4:46:35 PM UTC - **Commit**: 24923547018835429e8d08a35b6d1e9eec97b735 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 7.0.7-servicing.23269.7 to 7.0.7-servicing.23272.4][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.7-servicing.23269.7 to 7.0.7-servicing.23272.4][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.7-servicing.23269.7 to 7.0.7-servicing.23272.4][1] - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2][2] - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.7-servicing.23268.2 to 7.0.7-servicing.23269.6][3] - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2][2] - **Microsoft.NETCore.App.Ref**: [from 7.0.7 to 7.0.7][3] - **Microsoft.Private.Winforms**: [from 7.0.7-servicing.23268.9 to 7.0.7-servicing.23272.2][2] - **VS.Redist.Common.NetCore.SharedFrame...
1 parent 57b0d2b commit 2f39602

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-4906b56" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-4906b56c/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-8e3442d" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-8e3442dd/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" />
@@ -24,7 +24,7 @@
2424
<clear />
2525
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2626
<!-- Begin: Package sources from dotnet-runtime -->
27-
<add key="darc-int-dotnet-runtime-4906b56" value="true" />
27+
<add key="darc-int-dotnet-runtime-8e3442d" value="true" />
2828
<!-- End: Package sources from dotnet-runtime -->
2929
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3030
</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="7.0.7-servicing.23268.2" CoherentParentDependency="Microsoft.Private.Winforms">
4+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.7-servicing.23269.6" CoherentParentDependency="Microsoft.Private.Winforms">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>4906b56cca652ec986cb46bf1b4a9cc1fe1efe26</Sha>
6+
<Sha>8e3442dd52923615959c161ce49b9960375ea07b</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.7-servicing.23268.9" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
8+
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.7-servicing.23272.2" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>3632207d619ad47c9933baa5806b67b67d1a4b77</Sha>
10+
<Sha>e3bf366a7361267ba472521190d62c9d22f39b14</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.7-servicing.23269.7">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.7-servicing.23272.4">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>e43abfbcc8ce872b9ba591d87ec791e3f25423c0</Sha>
14+
<Sha>24923547018835429e8d08a35b6d1e9eec97b735</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.7-servicing.23269.7">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.7-servicing.23272.4">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>e43abfbcc8ce872b9ba591d87ec791e3f25423c0</Sha>
18+
<Sha>24923547018835429e8d08a35b6d1e9eec97b735</Sha>
1919
</Dependency>
2020
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.7" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>4906b56cca652ec986cb46bf1b4a9cc1fe1efe26</Sha>
22+
<Sha>8e3442dd52923615959c161ce49b9960375ea07b</Sha>
2323
</Dependency>
24-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.7-servicing.23268.2" CoherentParentDependency="Microsoft.Private.Winforms">
24+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.7-servicing.23269.6" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>4906b56cca652ec986cb46bf1b4a9cc1fe1efe26</Sha>
26+
<Sha>8e3442dd52923615959c161ce49b9960375ea07b</Sha>
2727
</Dependency>
2828
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.7" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>4906b56cca652ec986cb46bf1b4a9cc1fe1efe26</Sha>
30+
<Sha>8e3442dd52923615959c161ce49b9960375ea07b</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.7-servicing.23268.9" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.7-servicing.23272.2" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34-
<Sha>3632207d619ad47c9933baa5806b67b67d1a4b77</Sha>
34+
<Sha>e3bf366a7361267ba472521190d62c9d22f39b14</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.7-servicing.23269.7">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.7-servicing.23272.4">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>e43abfbcc8ce872b9ba591d87ec791e3f25423c0</Sha>
38+
<Sha>24923547018835429e8d08a35b6d1e9eec97b735</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>7.0</NETCoreAppMaximumVersion>
2020
<NETCoreAppFrameworkVersion>7.0</NETCoreAppFrameworkVersion>
2121
<NETCoreAppFramework>net$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
22-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.7-servicing.23268.9</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23-
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.7-servicing.23269.7</MicrosoftDotNetWpfProjectTemplatesVersion>
22+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.7-servicing.23272.2</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23+
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.7-servicing.23272.4</MicrosoftDotNetWpfProjectTemplatesVersion>
2424
</PropertyGroup>
2525
<!--Package versions-->
2626
<PropertyGroup>
@@ -32,12 +32,12 @@
3232
<!-- runtime -->
3333
<MicrosoftNETCoreAppRefVersion>7.0.7</MicrosoftNETCoreAppRefVersion>
3434
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.7</MicrosoftNETCoreAppRuntimewinx64Version>
35-
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.7-servicing.23268.2</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
36-
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.7-servicing.23268.2</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
35+
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.7-servicing.23269.6</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
36+
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.7-servicing.23269.6</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
3737
<!-- winforms -->
38-
<MicrosoftPrivateWinformsVersion>7.0.7-servicing.23268.9</MicrosoftPrivateWinformsVersion>
38+
<MicrosoftPrivateWinformsVersion>7.0.7-servicing.23272.2</MicrosoftPrivateWinformsVersion>
3939
<!-- wpf -->
40-
<MicrosoftDotNetWpfGitHubVersion>7.0.7-servicing.23269.7</MicrosoftDotNetWpfGitHubVersion>
40+
<MicrosoftDotNetWpfGitHubVersion>7.0.7-servicing.23272.4</MicrosoftDotNetWpfGitHubVersion>
4141
<!-- Not auto-updated. -->
4242
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
4343
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>

0 commit comments

Comments
 (0)