Skip to content

Commit 417429f

Browse files
dotnet-botmmitche
dotnet-bot
authored and
mmitche
committed
Merged PR 26878: [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.0-rtm.22517.2 to 7.0.0-rtm.22518.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 7.0.0-rtm.22513.8 to 7.0.0-rtm.22518.5 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 7.0.0 to 7.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22513.8 to 7.0.0-rtm.22518.5 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.0 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7 (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**: 20221018.2 - **Date Produced**: October 19, 2022 4:58:19 AM UTC - **Commit**: 636e2b7a00a434a354a126f510a56e16ce3c6bbc - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22518.2][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22518.2][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.0-rtm.22517.5 to 7.0.0-rtm.22518.2][1] - **Microsoft.Private.Winforms**: [from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7][2] - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.0-rtm.22513.8 to 7.0.0-rtm.22518.5][3] - **Microsoft.Private.Winforms**: [from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7][2] - **Microsoft.NETCore.App.Ref**: [from 7.0.0 to 7.0.0][3] - **Microsoft.Private.Winforms**: [from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.0-rtm.22513.8 to 7.0.0-rtm.22518.5][3] - **Microsoft.Private.Winforms**: [from 7.0.0-rtm.22517.2 to 7.0.0-rtm.22518.7][2] - **Micros...
1 parent 6bcf305 commit 417429f

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-bebb595" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-bebb5959/nuget/v3/index.json" />
12+
<add key="darc-int-dotnet-runtime-d099f07" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-d099f075/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-bebb595" value="true" />
27+
<add key="darc-int-dotnet-runtime-d099f07" 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.0-rtm.22513.8" CoherentParentDependency="Microsoft.Private.Winforms">
4+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.0-rtm.22518.5" CoherentParentDependency="Microsoft.Private.Winforms">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha>
6+
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.0-rtm.22517.2" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
8+
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.0-rtm.22518.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>77b444d039791bf7acf4869f99de695b28d7d6ef</Sha>
10+
<Sha>e83409daa530605da4eb5f847c6740a520325d25</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.0-rtm.22517.5">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.0-rtm.22518.2">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>d8beab3a71f4dab53451bf194f6da7e09dbb43ef</Sha>
14+
<Sha>636e2b7a00a434a354a126f510a56e16ce3c6bbc</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.0-rtm.22517.5">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.0-rtm.22518.2">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>d8beab3a71f4dab53451bf194f6da7e09dbb43ef</Sha>
18+
<Sha>636e2b7a00a434a354a126f510a56e16ce3c6bbc</Sha>
1919
</Dependency>
2020
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha>
22+
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
2323
</Dependency>
24-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rtm.22513.8" CoherentParentDependency="Microsoft.Private.Winforms">
24+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rtm.22518.5" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha>
26+
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
2727
</Dependency>
2828
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>bebb59597c8f98828b4cf2ae7724b277b15c47ee</Sha>
30+
<Sha>d099f075e45d2aa6007a22b71b45a08758559f80</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-rtm.22517.2" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.0-rtm.22518.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34-
<Sha>77b444d039791bf7acf4869f99de695b28d7d6ef</Sha>
34+
<Sha>e83409daa530605da4eb5f847c6740a520325d25</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-rtm.22517.5">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.0-rtm.22518.2">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>d8beab3a71f4dab53451bf194f6da7e09dbb43ef</Sha>
38+
<Sha>636e2b7a00a434a354a126f510a56e16ce3c6bbc</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.0-rtm.22517.2</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23-
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.0-rtm.22517.5</MicrosoftDotNetWpfProjectTemplatesVersion>
22+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.0-rtm.22518.7</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23+
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.0-rtm.22518.2</MicrosoftDotNetWpfProjectTemplatesVersion>
2424
</PropertyGroup>
2525
<!--Package versions-->
2626
<PropertyGroup>
@@ -32,12 +32,12 @@
3232
<!-- runtime -->
3333
<MicrosoftNETCoreAppRefVersion>7.0.0</MicrosoftNETCoreAppRefVersion>
3434
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
35-
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.0-rtm.22513.8</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
36-
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rtm.22513.8</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
35+
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.0-rtm.22518.5</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
36+
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rtm.22518.5</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
3737
<!-- winforms -->
38-
<MicrosoftPrivateWinformsVersion>7.0.0-rtm.22517.2</MicrosoftPrivateWinformsVersion>
38+
<MicrosoftPrivateWinformsVersion>7.0.0-rtm.22518.7</MicrosoftPrivateWinformsVersion>
3939
<!-- wpf -->
40-
<MicrosoftDotNetWpfGitHubVersion>7.0.0-rtm.22517.5</MicrosoftDotNetWpfGitHubVersion>
40+
<MicrosoftDotNetWpfGitHubVersion>7.0.0-rtm.22518.2</MicrosoftDotNetWpfGitHubVersion>
4141
<!-- Not auto-updated. -->
4242
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
4343
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>

0 commit comments

Comments
 (0)