Skip to content

Commit 6298294

Browse files
dotnet-botmmitche
dotnet-bot
authored and
mmitche
committed
Merged PR 32051: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
This pull request updates the following dependencies [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230620.10 - **Date Produced**: June 21, 2023 12:11:33 AM UTC - **Commit**: 2536781675df3fe4848e96605b0ee852fe3ee91b - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][2] - **Microsoft.Private.Winforms**: [from 6.0.19-servicing.23316.2 to 6.0.20-servicing.23320.10][2] - **Microsoft.NETCore.Platforms**: [from 6.0.11 to 6.0.11][3] - **Microsoft.NETCore.ILDAsm**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.19 to 6.0.20][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.19 to 6.0.20][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17][3] [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC4e9cc74519&targetVersion=GC2536781675&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCfcf11495c6&targetVersion=GCa08d9ce2ca&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81) [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.NETCore.Platforms**: from 6.0.11 to 6.0.11 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.19 to 6.0.20 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.19 to 6.0.20 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.19-servicing.23313.25 to 6.0.20-servicing.23320.17 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates)
1 parent b38efb9 commit 6298294

File tree

3 files changed

+23
-23
lines changed

3 files changed

+23
-23
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<clear />
66
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
77
<!-- Begin: Package sources from dotnet-runtime -->
8-
<add key="darc-int-dotnet-runtime-fcf1149" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fcf11495/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-a08d9ce" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-a08d9ce2/nuget/v3/index.json" />
99
<!-- End: Package sources from dotnet-runtime -->
1010
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1111
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -19,7 +19,7 @@
1919
<disabledPackageSources>
2020
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2121
<!-- Begin: Package sources from dotnet-runtime -->
22-
<add key="darc-int-dotnet-runtime-fcf1149" value="true" />
22+
<add key="darc-int-dotnet-runtime-a08d9ce" value="true" />
2323
<!-- End: Package sources from dotnet-runtime -->
2424
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2525
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.19-servicing.23316.2">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.20-servicing.23320.10">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>4e9cc74519c57c5c4913459618f0dab2d6696ea1</Sha>
6+
<Sha>2536781675df3fe4848e96605b0ee852fe3ee91b</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.19-servicing.23316.2">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.20-servicing.23320.10">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>4e9cc74519c57c5c4913459618f0dab2d6696ea1</Sha>
10+
<Sha>2536781675df3fe4848e96605b0ee852fe3ee91b</Sha>
1111
</Dependency>
1212
<Dependency Name="System.CodeDom" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -47,7 +47,7 @@
4747
</Dependency>
4848
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.11" CoherentParentDependency="Microsoft.Private.Winforms">
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
50-
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
50+
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
5151
</Dependency>
5252
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rtm.23315.3">
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
@@ -57,29 +57,29 @@
5757
<Uri>https://github.com/dotnet/runtime</Uri>
5858
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
5959
</Dependency>
60-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.19-servicing.23313.25" CoherentParentDependency="Microsoft.Private.Winforms">
60+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.20-servicing.23320.17" CoherentParentDependency="Microsoft.Private.Winforms">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
62+
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.19-servicing.23313.25" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.20-servicing.23320.17" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
66+
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
6767
</Dependency>
6868
<Dependency Name="System.Resources.Extensions" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
6969
<Uri>https://github.com/dotnet/runtime</Uri>
7070
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
7171
</Dependency>
72-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.19" CoherentParentDependency="Microsoft.Private.Winforms">
72+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.20" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
74-
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
74+
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.19" CoherentParentDependency="Microsoft.Private.Winforms">
76+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.20" CoherentParentDependency="Microsoft.Private.Winforms">
7777
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
78-
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
78+
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
7979
</Dependency>
80-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.19-servicing.23313.25" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.20-servicing.23320.17" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>fcf11495c6989362aa1012dc0d303ce619413624</Sha>
82+
<Sha>a08d9ce2caf02455c0b825bcdc32974bdf769a80</Sha>
8383
</Dependency>
8484
</ProductDependencies>
8585
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@
2626
</PropertyGroup>
2727
<!-- NuGet Package Versions -->
2828
<PropertyGroup>
29-
<MicrosoftPrivateWinformsVersion>6.0.19-servicing.23316.2</MicrosoftPrivateWinformsVersion>
29+
<MicrosoftPrivateWinformsVersion>6.0.20-servicing.23320.10</MicrosoftPrivateWinformsVersion>
3030
</PropertyGroup>
3131
<!-- Packages that come from https://github.com/dotnet/coreclr -->
3232
<PropertyGroup>
3333
<MicrosoftNETCoreRuntimeCoreCLRVersion>5.0.0-alpha1.19562.1</MicrosoftNETCoreRuntimeCoreCLRVersion>
34-
<MicrosoftNETCoreILDAsmVersion>6.0.19-servicing.23313.25</MicrosoftNETCoreILDAsmVersion>
35-
<MicrosoftNETCoreILAsmVersion>6.0.19-servicing.23313.25</MicrosoftNETCoreILAsmVersion>
34+
<MicrosoftNETCoreILDAsmVersion>6.0.20-servicing.23320.17</MicrosoftNETCoreILDAsmVersion>
35+
<MicrosoftNETCoreILAsmVersion>6.0.20-servicing.23320.17</MicrosoftNETCoreILAsmVersion>
3636
</PropertyGroup>
3737
<!-- Packages that come from https://github.com/dotnet/core-setup -->
3838
<PropertyGroup>
39-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.19-servicing.23313.25</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40-
<MicrosoftNETCoreAppRefVersion>6.0.19</MicrosoftNETCoreAppRefVersion>
41-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.19</MicrosoftNETCoreAppRuntimewinx64Version>
39+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.20-servicing.23320.17</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40+
<MicrosoftNETCoreAppRefVersion>6.0.20</MicrosoftNETCoreAppRefVersion>
41+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.20</MicrosoftNETCoreAppRuntimewinx64Version>
4242
<MicrosoftNETCorePlatformsVersion>6.0.11</MicrosoftNETCorePlatformsVersion>
4343
<SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion>
4444
<SystemDirectoryServicesVersion>6.0.1</SystemDirectoryServicesVersion>

0 commit comments

Comments
 (0)