Skip to content

Commit a606082

Browse files
dotnet-botmmitche
dotnet-bot
authored and
mmitche
committed
Merged PR 27590: [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.1-rtm.22528.3 to 7.0.1-servicing.22566.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 7.0.0-rtm.22513.5 to 7.0.1-servicing.22565.3 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.1-rtm.22528.3 to 7.0.1-servicing.22566.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 7.0.0 to 7.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.1-rtm.22528.3 to 7.0.1-servicing.22566.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.0-rtm.22513.5 to 7.0.1-servicing.22565.3 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.1-rtm.22528.3 to 7.0.1-servicing.22566.4 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.0 to 7.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.1-rtm.22528.3 to 7.0.1-servicing.22566.4 (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**: 20221117.2 - **Date Produced**: November 17, 2022 2:46:41 PM UTC - **Commit**: a6985a3e91f88860fd72ccc712c143b0a1dbd852 - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 7.0.1-servicing.22564.4 to 7.0.1-servicing.22567.2][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.1-servicing.22564.4 to 7.0.1-servicing.22567.2][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.1-servicing.22564.4 to 7.0.1-servicing.22567.2][1] - **Microsoft.Private.Winforms**: [from 7.0.1-rtm.22528.3 to 7.0.1-servicing.22566.4][2] - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.0-rtm.22513.5 to 7.0.1-servicing.22565.3][3] - **Microsoft.Private.Winforms**: [from 7.0.1-rtm.22528.3 to 7.0.1-servicing.22566.4][2] - **Microsoft.NETCore.App.Ref**: [from 7.0.0 to 7.0.1][3] - **Microsoft.Private.Winforms**: [from 7.0.1-rtm.22528.3 to 7.0.1-servicing.22566.4][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: [from 7.0.0-rtm.22513.5 to 7.0.1-servicing.22...
1 parent 55d98cc commit a606082

File tree

3 files changed

+34
-32
lines changed

3 files changed

+34
-32
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +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-f67308b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-f67308b0/nuget/v3/index.json" />
1213
<!-- End: Package sources from dotnet-runtime -->
1314
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1415
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -23,6 +24,7 @@
2324
<clear />
2425
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2526
<!-- Begin: Package sources from dotnet-runtime -->
27+
<add key="darc-int-dotnet-runtime-f67308b" value="true" />
2628
<!-- End: Package sources from dotnet-runtime -->
2729
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2830
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 24 additions & 24 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.5" CoherentParentDependency="Microsoft.Private.Winforms">
5-
<Uri>https://github.com/dotnet/runtime</Uri>
6-
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
4+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.1-servicing.22565.3" CoherentParentDependency="Microsoft.Private.Winforms">
5+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6+
<Sha>f67308b045b90cb188339580ccdb1a3c87763ae5</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.1-rtm.22528.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
9-
<Uri>https://github.com/dotnet/winforms</Uri>
10-
<Sha>672cc8c705697af4146629537abebcd483963375</Sha>
8+
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.1-servicing.22566.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
9+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10+
<Sha>b32a0afc982d443052bd9c6bd4ebe6177575681c</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.1-servicing.22564.4">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.1-servicing.22567.2">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>65b9f73cfdfa863bb4d0b40b2f9ad768f344025d</Sha>
14+
<Sha>a6985a3e91f88860fd72ccc712c143b0a1dbd852</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.1-servicing.22564.4">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.1-servicing.22567.2">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>65b9f73cfdfa863bb4d0b40b2f9ad768f344025d</Sha>
18+
<Sha>a6985a3e91f88860fd72ccc712c143b0a1dbd852</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
21-
<Uri>https://github.com/dotnet/runtime</Uri>
22-
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
20+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
21+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22+
<Sha>f67308b045b90cb188339580ccdb1a3c87763ae5</Sha>
2323
</Dependency>
24-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.0-rtm.22513.5" CoherentParentDependency="Microsoft.Private.Winforms">
25-
<Uri>https://github.com/dotnet/runtime</Uri>
26-
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
24+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.1-servicing.22565.3" CoherentParentDependency="Microsoft.Private.Winforms">
25+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26+
<Sha>f67308b045b90cb188339580ccdb1a3c87763ae5</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
29-
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>075e74ed1356f2e5bb978ac541633ab46e34bf99</Sha>
28+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
29+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30+
<Sha>f67308b045b90cb188339580ccdb1a3c87763ae5</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.1-rtm.22528.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
33-
<Uri>https://github.com/dotnet/winforms</Uri>
34-
<Sha>672cc8c705697af4146629537abebcd483963375</Sha>
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.1-servicing.22566.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
33+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34+
<Sha>b32a0afc982d443052bd9c6bd4ebe6177575681c</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.1-servicing.22564.4">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.1-servicing.22567.2">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>65b9f73cfdfa863bb4d0b40b2f9ad768f344025d</Sha>
38+
<Sha>a6985a3e91f88860fd72ccc712c143b0a1dbd852</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>7.0</NETCoreAppMaximumVersion>
2020
<NETCoreAppFrameworkVersion>7.0</NETCoreAppFrameworkVersion>
2121
<NETCoreAppFramework>net$(NETCoreAppFrameworkVersion)</NETCoreAppFramework>
22-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.1-rtm.22528.3</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23-
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.1-servicing.22564.4</MicrosoftDotNetWpfProjectTemplatesVersion>
22+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.1-servicing.22566.4</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23+
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.1-servicing.22567.2</MicrosoftDotNetWpfProjectTemplatesVersion>
2424
</PropertyGroup>
2525
<!--Package versions-->
2626
<PropertyGroup>
@@ -30,14 +30,14 @@
3030
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.22561.2</MicrosoftDotNetBuildTasksInstallersVersion>
3131
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.22561.2</MicrosoftDotNetVersionToolsTasksVersion>
3232
<!-- runtime -->
33-
<MicrosoftNETCoreAppRefVersion>7.0.0</MicrosoftNETCoreAppRefVersion>
34-
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.0</MicrosoftNETCoreAppRuntimewinx64Version>
35-
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.0-rtm.22513.5</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
36-
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.0-rtm.22513.5</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
33+
<MicrosoftNETCoreAppRefVersion>7.0.1</MicrosoftNETCoreAppRefVersion>
34+
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.1</MicrosoftNETCoreAppRuntimewinx64Version>
35+
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.1-servicing.22565.3</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
36+
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.1-servicing.22565.3</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
3737
<!-- winforms -->
38-
<MicrosoftPrivateWinformsVersion>7.0.1-rtm.22528.3</MicrosoftPrivateWinformsVersion>
38+
<MicrosoftPrivateWinformsVersion>7.0.1-servicing.22566.4</MicrosoftPrivateWinformsVersion>
3939
<!-- wpf -->
40-
<MicrosoftDotNetWpfGitHubVersion>7.0.1-servicing.22564.4</MicrosoftDotNetWpfGitHubVersion>
40+
<MicrosoftDotNetWpfGitHubVersion>7.0.1-servicing.22567.2</MicrosoftDotNetWpfGitHubVersion>
4141
<!-- Not auto-updated. -->
4242
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
4343
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>

0 commit comments

Comments
 (0)