Skip to content

Commit fcb07d6

Browse files
dotnet-botmmitche
authored andcommitted
Merged PR 21548: [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**: 20220314.7 - **Date Produced**: March 14, 2022 11:33:53 PM UTC - **Commit**: 0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7][7] - **Microsoft.Private.Winforms**: [from 6.0.3-servicing.22123.7 to 6.0.4-servicing.22164.7][7] - **Microsoft.NETCore.Platforms**: [from 6.0.2 to 6.0.3][8] - **Microsoft.NETCore.ILDAsm**: [from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4][8] - **Microsoft.NETCore.ILAsm**: [from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4][8] - **Microsoft.NETCore.App.Ref**: [from 6.0.3 to 6.0.4][8] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.3 to 6.0.4][8] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4][8] [7]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1f426c9&targetVersion=GC0c636f9&_a=files [8]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc24d9a9&targetVersion=GCbe98e88&_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.2 to 6.0.3 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.3 to 6.0.4 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.3 to 6.0.4 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.3-servicing.22123.9 to 6.0.4-servicing.22164.4 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates)
1 parent c7ec502 commit fcb07d6

File tree

3 files changed

+25
-23
lines changed

3 files changed

+25
-23
lines changed

NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +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-be98e88" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-be98e88c/nuget/v3/index.json" />
89
<!-- End: Package sources from dotnet-runtime -->
910
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1011
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -18,6 +19,7 @@
1819
<disabledPackageSources>
1920
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2021
<!-- Begin: Package sources from dotnet-runtime -->
22+
<add key="darc-int-dotnet-runtime-be98e88" value="true" />
2123
<!-- End: Package sources from dotnet-runtime -->
2224
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2325
</disabledPackageSources>

eng/Version.Details.xml

Lines changed: 16 additions & 16 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.3-servicing.22123.7">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.4-servicing.22164.7">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>1f426c90a9589dabc16d114aa91bfea9f21f8571</Sha>
6+
<Sha>0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.3-servicing.22123.7">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.4-servicing.22164.7">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>1f426c90a9589dabc16d114aa91bfea9f21f8571</Sha>
10+
<Sha>0c636f9d7cf5e0d9f23cf070c36711e7ac4d66ee</Sha>
1111
</Dependency>
1212
<Dependency Name="System.CodeDom" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -45,9 +45,9 @@
4545
<Uri>https://github.com/dotnet/runtime</Uri>
4646
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
4747
</Dependency>
48-
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
48+
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
50-
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
50+
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
5151
</Dependency>
5252
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rtm.22161.2">
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.3-servicing.22123.9" CoherentParentDependency="Microsoft.Private.Winforms">
60+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.4-servicing.22164.4" CoherentParentDependency="Microsoft.Private.Winforms">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
62+
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.3-servicing.22123.9" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.4-servicing.22164.4" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
66+
<Sha>be98e88c760526452df94ef452fff4602fb5bded</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.3" CoherentParentDependency="Microsoft.Private.Winforms">
72+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.4" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
74-
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
74+
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.3" CoherentParentDependency="Microsoft.Private.Winforms">
76+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.4" CoherentParentDependency="Microsoft.Private.Winforms">
7777
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
78-
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
78+
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
7979
</Dependency>
80-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.3-servicing.22123.9" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.4-servicing.22164.4" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>c24d9a9c91c5d04b7b4de71f1a9f33ac35e09663</Sha>
82+
<Sha>be98e88c760526452df94ef452fff4602fb5bded</Sha>
8383
</Dependency>
8484
</ProductDependencies>
8585
<ToolsetDependencies>

eng/Versions.props

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@
2626
</PropertyGroup>
2727
<!-- NuGet Package Versions -->
2828
<PropertyGroup>
29-
<MicrosoftPrivateWinformsVersion>6.0.3-servicing.22123.7</MicrosoftPrivateWinformsVersion>
29+
<MicrosoftPrivateWinformsVersion>6.0.4-servicing.22164.7</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.3-servicing.22123.9</MicrosoftNETCoreILDAsmVersion>
35-
<MicrosoftNETCoreILAsmVersion>6.0.3-servicing.22123.9</MicrosoftNETCoreILAsmVersion>
34+
<MicrosoftNETCoreILDAsmVersion>6.0.4-servicing.22164.4</MicrosoftNETCoreILDAsmVersion>
35+
<MicrosoftNETCoreILAsmVersion>6.0.4-servicing.22164.4</MicrosoftNETCoreILAsmVersion>
3636
</PropertyGroup>
3737
<!-- Packages that come from https://github.com/dotnet/core-setup -->
3838
<PropertyGroup>
39-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.3-servicing.22123.9</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40-
<MicrosoftNETCoreAppRefVersion>6.0.3</MicrosoftNETCoreAppRefVersion>
41-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.3</MicrosoftNETCoreAppRuntimewinx64Version>
42-
<MicrosoftNETCorePlatformsVersion>6.0.2</MicrosoftNETCorePlatformsVersion>
39+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.4-servicing.22164.4</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40+
<MicrosoftNETCoreAppRefVersion>6.0.4</MicrosoftNETCoreAppRefVersion>
41+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.4</MicrosoftNETCoreAppRuntimewinx64Version>
42+
<MicrosoftNETCorePlatformsVersion>6.0.3</MicrosoftNETCorePlatformsVersion>
4343
<SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion>
4444
<SystemDirectoryServicesVersion>6.0.0</SystemDirectoryServicesVersion>
4545
<SystemReflectionMetadataLoadContextVersion>6.0.0</SystemReflectionMetadataLoadContextVersion>

0 commit comments

Comments
 (0)