Skip to content

Commit 27813f8

Browse files
dotnet-botmmitche
dotnet-bot
authored and
mmitche
committed
Merged PR 29727: [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.4-servicing.23107.7 to 7.0.4-servicing.23117.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: from 7.0.3-servicing.23069.10 to 7.0.4-servicing.23115.8 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.4-servicing.23107.7 to 7.0.4-servicing.23117.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Ref**: from 7.0.3 to 7.0.4 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.4-servicing.23107.7 to 7.0.4-servicing.23117.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **VS.Redist.Common.NetCore.SharedFramework.x64.7.0**: from 7.0.3-servicing.23069.10 to 7.0.4-servicing.23115.8 (parent: Microsoft.Private.Winforms) - **Microsoft.Private.Winforms**: from 7.0.4-servicing.23107.7 to 7.0.4-servicing.23117.7 (parent: Microsoft.DotNet.Wpf.GitHub) - **Microsoft.NETCore.App.Runtime.win-x64**: from 7.0.3 to 7.0.4 (parent: Microsoft.Private.Winforms) - **Microsoft.Dotnet.WinForms.ProjectTemplates**: from 7.0.4-servicing.23107.7 to 7.0.4-servicing.23117.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**: 20230217.7 - **Date Produced**: February 17, 2023 10:47:41 PM UTC - **Commit**: 0315841ebb89a21c717002224ad9d39f3c21320a - **Branch**: refs/heads/internal/release/7.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.DotNet.Wpf.GitHub**: [from 7.0.4-servicing.23117.2 to 7.0.4-servicing.23117.7][1] - **Microsoft.DotNet.Wpf.ProjectTemplates**: [from 7.0.4-servicing.23117.2 to 7.0.4-servicing.23117.7][1] - **Microsoft.NET.Sdk.WindowsDesktop**: [from 7.0.4-servicing.23117.2 to 7.0.4-servicing.23117.7][1] - **Microsoft.Private.Winforms**: [from 7.0.4-servicing.23107.7 to 7.0.4-servicing.23117.7][2] - **Microsoft.Internal.Runtime.WindowsDesktop.Transport**: [from 7.0.3-servicing.23069.10 to 7.0.4-servicing.23115.8][3] - **Microsoft.Private.Winforms**: [from 7.0.4-servicing.23107.7 to 7.0.4-servicing.23117.7][2] - **Microsoft.NETCore.App.Ref**: [from 7.0.3 to 7.0.4][3] - **Microsoft.Private.Winforms**: [from 7.0.4-servicing.23107.7 to 7.0.4-servicing.23117.7][2] - **VS.Redist.Common.NetCore.Sh...
1 parent 9ee3b82 commit 27813f8

File tree

3 files changed

+28
-26
lines changed

3 files changed

+28
-26
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-0a396ac" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-0a396aca/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-0a396ac" 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: 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="7.0.3-servicing.23069.10" CoherentParentDependency="Microsoft.Private.Winforms">
4+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="7.0.4-servicing.23115.8" CoherentParentDependency="Microsoft.Private.Winforms">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
6+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.4-servicing.23107.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
8+
<Dependency Name="Microsoft.Private.Winforms" Version="7.0.4-servicing.23117.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>84d909e676d61df36f5c7aa269e5c471fc6530bf</Sha>
10+
<Sha>2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.4-servicing.23117.2">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="7.0.4-servicing.23117.7">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>fa6e95d0d2287982dade926f08843e78ecb32e2b</Sha>
14+
<Sha>0315841ebb89a21c717002224ad9d39f3c21320a</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.4-servicing.23117.2">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="7.0.4-servicing.23117.7">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>fa6e95d0d2287982dade926f08843e78ecb32e2b</Sha>
18+
<Sha>0315841ebb89a21c717002224ad9d39f3c21320a</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.4" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
22+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
2323
</Dependency>
24-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.3-servicing.23069.10" CoherentParentDependency="Microsoft.Private.Winforms">
24+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.7.0" Version="7.0.4-servicing.23115.8" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
26+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
28+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="7.0.4" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>0a2bda10e81d901396c3cff95533529e3a93ad47</Sha>
30+
<Sha>0a396acafe9a7d46bce11f4338dbb3dd0d99b1b4</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.4-servicing.23107.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="7.0.4-servicing.23117.7" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34-
<Sha>84d909e676d61df36f5c7aa269e5c471fc6530bf</Sha>
34+
<Sha>2f3cabf9537c7d9a9f2f61ea2ad49a4c10ac7d4b</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.4-servicing.23117.2">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="7.0.4-servicing.23117.7">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>fa6e95d0d2287982dade926f08843e78ecb32e2b</Sha>
38+
<Sha>0315841ebb89a21c717002224ad9d39f3c21320a</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.4-servicing.23107.7</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23-
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.4-servicing.23117.2</MicrosoftDotNetWpfProjectTemplatesVersion>
22+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>7.0.4-servicing.23117.7</MicrosoftDotnetWinFormsProjectTemplatesVersion>
23+
<MicrosoftDotNetWpfProjectTemplatesVersion>7.0.4-servicing.23117.7</MicrosoftDotNetWpfProjectTemplatesVersion>
2424
</PropertyGroup>
2525
<!--Package versions-->
2626
<PropertyGroup>
@@ -30,14 +30,14 @@
3030
<MicrosoftDotNetBuildTasksInstallersVersion>7.0.0-beta.23114.3</MicrosoftDotNetBuildTasksInstallersVersion>
3131
<MicrosoftDotNetVersionToolsTasksVersion>7.0.0-beta.23114.3</MicrosoftDotNetVersionToolsTasksVersion>
3232
<!-- runtime -->
33-
<MicrosoftNETCoreAppRefVersion>7.0.3</MicrosoftNETCoreAppRefVersion>
34-
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.3</MicrosoftNETCoreAppRuntimewinx64Version>
35-
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.3-servicing.23069.10</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
36-
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.3-servicing.23069.10</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
33+
<MicrosoftNETCoreAppRefVersion>7.0.4</MicrosoftNETCoreAppRefVersion>
34+
<MicrosoftNETCoreAppRuntimewinx64Version>7.0.4</MicrosoftNETCoreAppRuntimewinx64Version>
35+
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>7.0.4-servicing.23115.8</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
36+
<VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>7.0.4-servicing.23115.8</VSRedistCommonNetCoreSharedFrameworkx6470PackageVersion>
3737
<!-- winforms -->
38-
<MicrosoftPrivateWinformsVersion>7.0.4-servicing.23107.7</MicrosoftPrivateWinformsVersion>
38+
<MicrosoftPrivateWinformsVersion>7.0.4-servicing.23117.7</MicrosoftPrivateWinformsVersion>
3939
<!-- wpf -->
40-
<MicrosoftDotNetWpfGitHubVersion>7.0.4-servicing.23117.2</MicrosoftDotNetWpfGitHubVersion>
40+
<MicrosoftDotNetWpfGitHubVersion>7.0.4-servicing.23117.7</MicrosoftDotNetWpfGitHubVersion>
4141
<!-- Not auto-updated. -->
4242
<MicrosoftBuildVersion>15.7.179</MicrosoftBuildVersion>
4343
<MicrosoftBuildFrameworkVersion>$(MicrosoftBuildVersion)</MicrosoftBuildFrameworkVersion>

0 commit comments

Comments
 (0)