Skip to content

Commit 4bc6721

Browse files
maestro-prod-Primaryvseanreesermsft
maestro-prod-Primary
authored and
vseanreesermsft
committed
Merged PR 42744: [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**: - **System.IO.Packaging**: from 6.0.0 to 6.0.1 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILDAsm**: from 6.0.34-servicing.24416.23 to 6.0.35-servicing.24459.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.ILAsm**: from 6.0.34-servicing.24416.23 to 6.0.35-servicing.24459.18 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Ref**: from 6.0.34 to 6.0.35 (parent: Microsoft.Private.Winforms) - **Microsoft.NETCore.App.Runtime.win-x64**: from 6.0.34 to 6.0.35 (parent: Microsoft.Private.Winforms) - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: from 6.0.34-servicing.24416.23 to 6.0.35-servicing.24459.18 (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**: 20240911.4 - **Date Produced**: September 11, 2024 8:46:29 PM UTC - **Commit**: 1e8489e39e0709c40aa5540825b5e9e2c1c5a23b - **Branch**: refs/heads/internal/release/6.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.Dotnet.WinForms.ProjectTemplates**: [from 6.0.35-servicing.24430.7 to 6.0.35-servicing.24461.4][1] - **Microsoft.Private.Winforms**: [from 6.0.35-servicing.24430.7 to 6.0.35-servicing.24461.4][1] - **System.IO.Packaging**: [from 6.0.0 to 6.0.1][2] - **Microsoft.NETCore.ILDAsm**: [from 6.0.34-servicing.24416.23 to 6.0.35-servicing.24459.18][3] - **Microsoft.NETCore.ILAsm**: [from 6.0.34-servicing.24416.23 to 6.0.35-servicing.24459.18][3] - **Microsoft.NETCore.App.Ref**: [from 6.0.34 to 6.0.35][3] - **Microsoft.NETCore.App.Runtime.win-x64**: [from 6.0.34 to 6.0.35][3] - **VS.Redist.Common.NetCore.SharedFramework.x64.6.0**: [from 6.0.34-servicing.24416.23 to 6.0.35-servicing.24459.18][3] [1]: https://dev.azure.com/dnceng/internal/_git/dotnet-winforms/branches?baseVersion=GC1547140f9918168ddd39f53c9e19490def83b761&targetVersion=GC1e8489e39e0709c40aa5540825b5e9e2c1c5a23b&_a=files [2]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC4822e3c3aa77eb82b2fb33c9321f923cf11ddde6&targetVersion=GCb357f86ce3bce7c232ea242074b17bebdc50b543&_a=files [3]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC98588b0f0d72383aca8722755d838ae1d542ce62&targetVersion=GCb357f86ce3bce7c232ea242...
2 parents 7231484 + 56e34fd commit 4bc6721

File tree

3 files changed

+26
-28
lines changed

3 files changed

+26
-28
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-98588b0" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-98588b0f/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-98588b0-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-98588b0f-2/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-b357f86" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-b357f86c/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-98588b0-2" value="true" />
24-
<add key="darc-int-dotnet-runtime-98588b0" value="true" />
22+
<add key="darc-int-dotnet-runtime-b357f86" 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: 17 additions & 17 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.35-servicing.24430.7">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="6.0.35-servicing.24461.4">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>1547140f9918168ddd39f53c9e19490def83b761</Sha>
6+
<Sha>1e8489e39e0709c40aa5540825b5e9e2c1c5a23b</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.35-servicing.24430.7">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="6.0.35-servicing.24461.4">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>1547140f9918168ddd39f53c9e19490def83b761</Sha>
10+
<Sha>1e8489e39e0709c40aa5540825b5e9e2c1c5a23b</Sha>
1111
</Dependency>
1212
<Dependency Name="System.CodeDom" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
@@ -53,33 +53,33 @@
5353
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
5454
<Sha>c2a59ae0ff0eb57f535302776eeaa238b44a569a</Sha>
5555
</Dependency>
56-
<Dependency Name="System.IO.Packaging" Version="6.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
57-
<Uri>https://github.com/dotnet/runtime</Uri>
58-
<Sha>4822e3c3aa77eb82b2fb33c9321f923cf11ddde6</Sha>
56+
<Dependency Name="System.IO.Packaging" Version="6.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
57+
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
58+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
5959
</Dependency>
60-
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.34-servicing.24416.23" CoherentParentDependency="Microsoft.Private.Winforms">
60+
<Dependency Name="Microsoft.NETCore.ILDAsm" Version="6.0.35-servicing.24459.18" CoherentParentDependency="Microsoft.Private.Winforms">
6161
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
62-
<Sha>98588b0f0d72383aca8722755d838ae1d542ce62</Sha>
62+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
6363
</Dependency>
64-
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.34-servicing.24416.23" CoherentParentDependency="Microsoft.Private.Winforms">
64+
<Dependency Name="Microsoft.NETCore.ILAsm" Version="6.0.35-servicing.24459.18" CoherentParentDependency="Microsoft.Private.Winforms">
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
66-
<Sha>98588b0f0d72383aca8722755d838ae1d542ce62</Sha>
66+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</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.34" CoherentParentDependency="Microsoft.Private.Winforms">
72+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="6.0.35" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
74-
<Sha>98588b0f0d72383aca8722755d838ae1d542ce62</Sha>
74+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
7575
</Dependency>
76-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.34" CoherentParentDependency="Microsoft.Private.Winforms">
76+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="6.0.35" CoherentParentDependency="Microsoft.Private.Winforms">
7777
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
78-
<Sha>98588b0f0d72383aca8722755d838ae1d542ce62</Sha>
78+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
7979
</Dependency>
80-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.34-servicing.24416.23" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.6.0" Version="6.0.35-servicing.24459.18" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>98588b0f0d72383aca8722755d838ae1d542ce62</Sha>
82+
<Sha>b357f86ce3bce7c232ea242074b17bebdc50b543</Sha>
8383
</Dependency>
8484
</ProductDependencies>
8585
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,24 +21,24 @@
2121
<PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
2222
<PreReleaseVersionIteration>
2323
</PreReleaseVersionIteration>
24-
<SystemIOPackagingVersion>6.0.0</SystemIOPackagingVersion>
24+
<SystemIOPackagingVersion>6.0.1</SystemIOPackagingVersion>
2525
<SystemResourcesExtensionsVersion>6.0.0</SystemResourcesExtensionsVersion>
2626
</PropertyGroup>
2727
<!-- NuGet Package Versions -->
2828
<PropertyGroup>
29-
<MicrosoftPrivateWinformsVersion>6.0.35-servicing.24430.7</MicrosoftPrivateWinformsVersion>
29+
<MicrosoftPrivateWinformsVersion>6.0.35-servicing.24461.4</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.34-servicing.24416.23</MicrosoftNETCoreILDAsmVersion>
35-
<MicrosoftNETCoreILAsmVersion>6.0.34-servicing.24416.23</MicrosoftNETCoreILAsmVersion>
34+
<MicrosoftNETCoreILDAsmVersion>6.0.35-servicing.24459.18</MicrosoftNETCoreILDAsmVersion>
35+
<MicrosoftNETCoreILAsmVersion>6.0.35-servicing.24459.18</MicrosoftNETCoreILAsmVersion>
3636
</PropertyGroup>
3737
<!-- Packages that come from https://github.com/dotnet/core-setup -->
3838
<PropertyGroup>
39-
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.34-servicing.24416.23</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40-
<MicrosoftNETCoreAppRefVersion>6.0.34</MicrosoftNETCoreAppRefVersion>
41-
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.34</MicrosoftNETCoreAppRuntimewinx64Version>
39+
<VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>6.0.35-servicing.24459.18</VSRedistCommonNetCoreSharedFrameworkx6460PackageVersion>
40+
<MicrosoftNETCoreAppRefVersion>6.0.35</MicrosoftNETCoreAppRefVersion>
41+
<MicrosoftNETCoreAppRuntimewinx64Version>6.0.35</MicrosoftNETCoreAppRuntimewinx64Version>
4242
<MicrosoftNETCorePlatformsVersion>6.0.13</MicrosoftNETCorePlatformsVersion>
4343
<SystemDrawingCommonVersion>6.0.0</SystemDrawingCommonVersion>
4444
<SystemDirectoryServicesVersion>6.0.1</SystemDirectoryServicesVersion>

0 commit comments

Comments
 (0)