Skip to content

Commit 710283c

Browse files
vseanreesermsftvseanreesermsft
committed
Merge commit '5bf5c017e225debf2b431cf33d0e4fad03039032' into internal-merge-8.0-2025-05-13-1457
2 parents 7eaea7e + 5bf5c01 commit 710283c

File tree

3 files changed

+24
-32
lines changed

3 files changed

+24
-32
lines changed

‎NuGet.config‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,10 @@
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-50c4cb9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-50c4cb9-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f-2/nuget/v3/index.json" />
10-
<add key="darc-int-dotnet-runtime-50c4cb9-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-50c4cb9f-1/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-efd5742" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-efd5742b/nuget/v3/index.json" />
119
<!-- End: Package sources from dotnet-runtime -->
1210
<!-- Begin: Package sources from dotnet-winforms -->
13-
<add key="darc-int-dotnet-winforms-2c14c37" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-2c14c37b/nuget/v3/index.json" />
14-
<add key="darc-int-dotnet-winforms-2c14c37-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-2c14c37b-2/nuget/v3/index.json" />
15-
<add key="darc-int-dotnet-winforms-2c14c37-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-2c14c37b-1/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-winforms-c4b79de" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-c4b79dec/nuget/v3/index.json" />
1612
<!-- End: Package sources from dotnet-winforms -->
1713
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1814
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -26,14 +22,10 @@
2622
<disabledPackageSources>
2723
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2824
<!-- Begin: Package sources from dotnet-runtime -->
29-
<add key="darc-int-dotnet-runtime-50c4cb9-1" value="true" />
30-
<add key="darc-int-dotnet-runtime-50c4cb9-2" value="true" />
31-
<add key="darc-int-dotnet-runtime-50c4cb9" value="true" />
25+
<add key="darc-int-dotnet-runtime-efd5742" value="true" />
3226
<!-- End: Package sources from dotnet-runtime -->
3327
<!-- Begin: Package sources from dotnet-winforms -->
34-
<add key="darc-int-dotnet-winforms-2c14c37-1" value="true" />
35-
<add key="darc-int-dotnet-winforms-2c14c37-2" value="true" />
36-
<add key="darc-int-dotnet-winforms-2c14c37" value="true" />
28+
<add key="darc-int-dotnet-winforms-c4b79de" value="true" />
3729
<!-- End: Package sources from dotnet-winforms -->
3830
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3931
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 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="8.0.15-servicing.25165.1">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.16-servicing.25217.2">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>2c14c37b0340b3745b630670a1944d260bf3da57</Sha>
6+
<Sha>c4b79deca3753d92e126fa2df778fe10ab4e6d6d</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.15-servicing.25165.1">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.16-servicing.25217.2">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>2c14c37b0340b3745b630670a1944d260bf3da57</Sha>
10+
<Sha>c4b79deca3753d92e126fa2df778fe10ab4e6d6d</Sha>
1111
</Dependency>
1212
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -17,9 +17,9 @@
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
1818
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.15-servicing.25164.13" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.16-servicing.25215.6" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
22+
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
2323
</Dependency>
2424
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="8.0.0-rtm.25168.2">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
@@ -29,17 +29,17 @@
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
3030
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.15" CoherentParentDependency="Microsoft.Private.Winforms">
32+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.16" CoherentParentDependency="Microsoft.Private.Winforms">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
34+
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.15" CoherentParentDependency="Microsoft.Private.Winforms">
36+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.16" CoherentParentDependency="Microsoft.Private.Winforms">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
38-
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
38+
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
3939
</Dependency>
40-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.15-servicing.25164.13" CoherentParentDependency="Microsoft.Private.Winforms">
40+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.16-servicing.25215.6" CoherentParentDependency="Microsoft.Private.Winforms">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
42-
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
42+
<Sha>efd5742bb5dd1677fbbbeb277bcfb5c9025548e5</Sha>
4343
</Dependency>
4444
<!-- These dependencies are required by windowsdesktop for coherency. -->
4545
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
@@ -150,9 +150,9 @@
150150
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
151151
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
152152
</Dependency>
153-
<Dependency Name="System.Drawing.Common" Version="8.0.15">
153+
<Dependency Name="System.Drawing.Common" Version="8.0.16">
154154
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
155-
<Sha>2c14c37b0340b3745b630670a1944d260bf3da57</Sha>
155+
<Sha>c4b79deca3753d92e126fa2df778fe10ab4e6d6d</Sha>
156156
</Dependency>
157157
</ProductDependencies>
158158
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
</PropertyGroup>
2323
<!-- Packages that come from https://github.com/dotnet/winforms -->
2424
<PropertyGroup>
25-
<MicrosoftPrivateWinformsVersion>8.0.15-servicing.25165.1</MicrosoftPrivateWinformsVersion>
25+
<MicrosoftPrivateWinformsVersion>8.0.16-servicing.25217.2</MicrosoftPrivateWinformsVersion>
2626
</PropertyGroup>
2727
<!-- Packages that come from https://github.com/dotnet/runtime -->
2828
<PropertyGroup>
29-
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.15-servicing.25164.13</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
30-
<MicrosoftNETCoreAppRefVersion>8.0.15</MicrosoftNETCoreAppRefVersion>
31-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.15</MicrosoftNETCoreAppRuntimewinx64Version>
32-
<MicrosoftNETCorePlatformsVersion>8.0.15-servicing.25164.13</MicrosoftNETCorePlatformsVersion>
29+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.16-servicing.25215.6</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
30+
<MicrosoftNETCoreAppRefVersion>8.0.16</MicrosoftNETCoreAppRefVersion>
31+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.16</MicrosoftNETCoreAppRuntimewinx64Version>
32+
<MicrosoftNETCorePlatformsVersion>8.0.16-servicing.25215.6</MicrosoftNETCorePlatformsVersion>
3333
<SystemCodeDomPackageVersion>8.0.0</SystemCodeDomPackageVersion>
3434
<SystemConfigurationConfigurationManagerPackageVersion>8.0.1</SystemConfigurationConfigurationManagerPackageVersion>
3535
<SystemDiagnosticsEventLogPackageVersion>8.0.2</SystemDiagnosticsEventLogPackageVersion>
36-
<SystemDrawingCommonVersion>8.0.15</SystemDrawingCommonVersion>
36+
<SystemDrawingCommonVersion>8.0.16</SystemDrawingCommonVersion>
3737
<SystemDirectoryServicesVersion>8.0.0</SystemDirectoryServicesVersion>
3838
<SystemIOPackagingVersion>8.0.1</SystemIOPackagingVersion>
3939
<SystemReflectionMetadataLoadContextVersion>8.0.1</SystemReflectionMetadataLoadContextVersion>

0 commit comments

Comments
 (0)