Skip to content

Commit 2bc8523

Browse files
dotnet-botvseanreesermsft
authored andcommitted
Merged PR 40420: [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.ILDAsm**: from 6.0.32-servicing.24310.33 to 6.0.32-servicing.24313.8 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.32-servicing.24310.33 to 6.0.32-servicing.24313.8 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.32 to 6.0.32 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.32 to 6.0.32 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.32-servicing.24310.33 to 6.0.32-servicing.24313.8 (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**: 20240613.6 - **Date Produced**: June 13, 2024 9:32:40 PM UTC - **Commit**: 2e544744bf8fc5ee2ff1462531b7dd8e3c4af885 - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.32-servicing.24312.1 to 6.0.32-servicing.24313.6][1] - **Microsoft.Private.Winforms**: [from 6.0.32-servicing.24312.1 to 6.0.32-servicing.24313.6][1] - **Microsoft.NETCore.ILDAsm**: [from 6.0.32-servicing.24310.33 to 6.0.32-servicing.24313.8][2] - **Microsoft.NETCore.ILAsm**: [from 6.0.32-servicing.24310.33 to 6.0.32-servicing.24313.8][2] - **Microsoft.NETCore.App.Ref**: [from 6.0.32 to 6.0.32][2] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.32 to 6.0.32][2] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.32-servicing.24310.33 to 6.0.32-servicing.24313.8][2] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC0d0145ef1ba75ce4aaf306b233688edd3ec1ffb4&targetVersion=GC2e544744bf8fc5ee2ff1462531b7dd8e3c4af885&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GCc1b0b27947208969c44a51033aef7fea048f3e55&targetVersion=GCafb18ba908d9a6b8334c1e156ec88638932dedd1&_a=files [DependencyUpdate]: <> (End) [marker]: <> (End:a88d6455-e128-4280-39b4-08d960f4ca81)
2 parents cc260c4 + 5c25d8b commit 2bc8523

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
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-c1b0b27" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-c1b0b279/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-afb18ba" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-afb18ba9/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-c1b0b27" value="true" />
22+
<add key="darc-int-dotnet-runtime-afb18ba" 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: 12 additions & 12 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.32-servicing.24312.1">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.32-servicing.24313.6">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>0d0145ef1ba75ce4aaf306b233688edd3ec1ffb4</Sha>
6+
<Sha>2e544744bf8fc5ee2ff1462531b7dd8e3c4af885</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.32-servicing.24312.1">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.32-servicing.24313.6">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>0d0145ef1ba75ce4aaf306b233688edd3ec1ffb4</Sha>
10+
<Sha>2e544744bf8fc5ee2ff1462531b7dd8e3c4af885</Sha>
1111
</Dependency>
1212
<Dependency Name="System.CodeDom" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://github.com/dotnet/runtime</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.32-servicing.24310.33" CoherentParentDependency="Microsoft.Private.Winforms">
60+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.32-servicing.24313.8" CoherentParentDependency="Microsoft.Private.Winforms">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>c1b0b27947208969c44a51033aef7fea048f3e55</Sha>
62+
<Sha>afb18ba908d9a6b8334c1e156ec88638932dedd1</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.32-servicing.24310.33" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.32-servicing.24313.8" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>c1b0b27947208969c44a51033aef7fea048f3e55</Sha>
66+
<Sha>afb18ba908d9a6b8334c1e156ec88638932dedd1</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>
7272
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.32" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
74-
<Sha>c1b0b27947208969c44a51033aef7fea048f3e55</Sha>
74+
<Sha>afb18ba908d9a6b8334c1e156ec88638932dedd1</Sha>
7575
</Dependency>
7676
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.32" CoherentParentDependency="Microsoft.Private.Winforms">
7777
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
78-
<Sha>c1b0b27947208969c44a51033aef7fea048f3e55</Sha>
78+
<Sha>afb18ba908d9a6b8334c1e156ec88638932dedd1</Sha>
7979
</Dependency>
80-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.32-servicing.24310.33" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.32-servicing.24313.8" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>c1b0b27947208969c44a51033aef7fea048f3e55</Sha>
82+
<Sha>afb18ba908d9a6b8334c1e156ec88638932dedd1</Sha>
8383
</Dependency>
8484
</ProductDependencies>
8585
<ToolsetDependencies>

eng/Versions.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@
2626
</PropertyGroup>
2727
<!-- NuGet Package Versions -->
2828
<PropertyGroup>
29-
<MicrosoftPrivateWinformsVersion>6.0.32-servicing.24312.1</MicrosoftPrivateWinformsVersion>
29+
<MicrosoftPrivateWinformsVersion>6.0.32-servicing.24313.6</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.32-servicing.24310.33</MicrosoftNETCoreILDAsmVersion>
35-
<MicrosoftNETCoreILAsmVersion>6.0.32-servicing.24310.33</MicrosoftNETCoreILAsmVersion>
34+
<MicrosoftNETCoreILDAsmVersion>6.0.32-servicing.24313.8</MicrosoftNETCoreILDAsmVersion>
35+
<MicrosoftNETCoreILAsmVersion>6.0.32-servicing.24313.8</MicrosoftNETCoreILAsmVersion>
3636
</PropertyGroup>
3737
<!-- Packages that come from https://github.com/dotnet/core-setup -->
3838
<PropertyGroup>
39-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.32-servicing.24310.33</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
39+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.32-servicing.24313.8</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
4040
<MicrosoftNETCoreAppRefVersion>6.0.32</MicrosoftNETCoreAppRefVersion>
4141
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.32</MicrosoftNETCoreAppRuntimewinx64Version>
4242
<MicrosoftNETCorePlatformsVersion>6.0.13</MicrosoftNETCorePlatformsVersion>

0 commit comments

Comments
 (0)