Skip to content

Commit c68b021

Browse files
dotnet-botmmitche
dotnet-bot
authored and
mmitche
committed
Merged PR 29712: [internal/release/6.0] Update dependencies from dnceng/internal/dotnet-winforms
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.NETCore.Platforms**: from 6.0.7 to 6.0.8 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.14 to 6.0.15 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.14 to 6.0.15 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7 (parent: Microsoft.Private.Winforms) [DependencyUpdate]: <> (End) [marker]: <> (End:Coherency Updates) [marker]: <> (Begin:a88d6455-e128-4280-39b4-08d960f4ca81) ## From https://dev.azure.com/dnceng/internal/_git/dotnet-winforms - **Subscription**: a88d6455-e128-4280-39b4-08d960f4ca81 - **Build**: 20230217.2 - **Date Produced**: February 17, 2023 6:21:21 PM UTC - **Commit**: 1808f3abeb2af5809325c218ec752ab185df6678 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.15-servicing.23115.7 to 6.0.15-servicing.23117.2][1] - **Microsoft.Private.Winforms**: [from 6.0.15-servicing.23115.7 to 6.0.15-servicing.23117.2][1] - **Microsoft.NETCore.Platforms**: [from 6.0.7 to 6.0.8][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.14 to 6.0.15][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.14 to 6.0.15][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.14-servicing.23073.9 to 6.0.15-servicing.23115.7][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC56544e3&targetVersion=GC1808f3a&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC943474c&targetVersion=GC5edef4b&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC2a90daa&targetVersion=GC5edef4b&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
1 parent cb6e6bd commit c68b021

File tree

3 files changed

+25
-27
lines changed

3 files changed

+25
-27
lines changed

‎NuGet.config‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +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-2a90daa" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2a90daa2/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-2a90daa-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-2a90daa2-1/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-5edef4b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-5edef4b2/nuget/v3/index.json" />
109
<!-- End: Package sources from dotnet-runtime -->
1110
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1211
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -20,8 +19,7 @@
2019
<disabledPackageSources>
2120
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2221
<!-- Begin: Package sources from dotnet-runtime -->
23-
<add key="darc-int-dotnet-runtime-2a90daa-1" value="true" />
24-
<add key="darc-int-dotnet-runtime-2a90daa" value="true" />
22+
<add key="darc-int-dotnet-runtime-5edef4b" value="true" />
2523
<!-- End: Package sources from dotnet-runtime -->
2624
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2725
</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.15-servicing.23115.7">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.15-servicing.23117.2">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>56544e31a1911ed5b7cc716c1b62d3862cc7442c</Sha>
6+
<Sha>1808f3abeb2af5809325c218ec752ab185df6678</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.15-servicing.23115.7">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.15-servicing.23117.2">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>56544e31a1911ed5b7cc716c1b62d3862cc7442c</Sha>
10+
<Sha>1808f3abeb2af5809325c218ec752ab185df6678</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.7" CoherentParentDependency="Microsoft.Private.Winforms">
48+
<Dependency Name="Microsoft.NETCore.Platforms" Version="6.0.8" CoherentParentDependency="Microsoft.Private.Winforms">
4949
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
50-
<Sha>943474ca16db7c65ba6cff4a89c3ebd219dde3e5</Sha>
50+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
5151
</Dependency>
5252
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="6.0.0-rtm.22513.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.14-servicing.23073.9" CoherentParentDependency="Microsoft.Private.Winforms">
60+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.15-servicing.23115.7" CoherentParentDependency="Microsoft.Private.Winforms">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
62+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.14-servicing.23073.9" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.15-servicing.23115.7" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
66+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</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.14" CoherentParentDependency="Microsoft.Private.Winforms">
72+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.15" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
74-
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
74+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.14" CoherentParentDependency="Microsoft.Private.Winforms">
76+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.15" CoherentParentDependency="Microsoft.Private.Winforms">
7777
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
78-
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
78+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</Sha>
7979
</Dependency>
80-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.14-servicing.23073.9" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.15-servicing.23115.7" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>2a90daa2cc41ae8f11a2c1519cb8b235f609251a</Sha>
82+
<Sha>5edef4b20babd4c3ddac7460e536f86fd0f2d724</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.15-servicing.23115.7</MicrosoftPrivateWinformsVersion>
29+
<MicrosoftPrivateWinformsVersion>6.0.15-servicing.23117.2</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.14-servicing.23073.9</MicrosoftNETCoreILDAsmVersion>
35-
<MicrosoftNETCoreILAsmVersion>6.0.14-servicing.23073.9</MicrosoftNETCoreILAsmVersion>
34+
<MicrosoftNETCoreILDAsmVersion>6.0.15-servicing.23115.7</MicrosoftNETCoreILDAsmVersion>
35+
<MicrosoftNETCoreILAsmVersion>6.0.15-servicing.23115.7</MicrosoftNETCoreILAsmVersion>
3636
</PropertyGroup>
3737
<!-- Packages that come from https://github.com/dotnet/core-setup -->
3838
<PropertyGroup>
39-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.14-servicing.23073.9</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40-
<MicrosoftNETCoreAppRefVersion>6.0.14</MicrosoftNETCoreAppRefVersion>
41-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.14</MicrosoftNETCoreAppRuntimewinx64Version>
42-
<MicrosoftNETCorePlatformsVersion>6.0.7</MicrosoftNETCorePlatformsVersion>
39+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.15-servicing.23115.7</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40+
<MicrosoftNETCoreAppRefVersion>6.0.15</MicrosoftNETCoreAppRefVersion>
41+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.15</MicrosoftNETCoreAppRuntimewinx64Version>
42+
<MicrosoftNETCorePlatformsVersion>6.0.8</MicrosoftNETCorePlatformsVersion>
4343
<SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion>
4444
<SystemDirectoryServicesVersion>6.0.1</SystemDirectoryServicesVersion>
4545
<SystemReflectionMetadataLoadContextVersion>6.0.0</SystemReflectionMetadataLoadContextVersion>

0 commit comments

Comments
 (0)