Skip to content

Commit 4705527

Browse files
harshit7962harshit7962
authored
Merge pull request #11185 from vseanreesermsft/internal-merge-8.0-2025-10-14-1146
Merging internal commits for release/8.0
2 parents afce7df + bc188ea commit 4705527

File tree

3 files changed

+24
-20
lines changed

3 files changed

+24
-20
lines changed

‎NuGet.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +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-362ab66" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-362ab666/nuget/v3/index.json" />
89
<!-- End: Package sources from dotnet-runtime -->
910
<!-- Begin: Package sources from dotnet-winforms -->
11+
<add key="darc-int-dotnet-winforms-5f22caf" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-5f22caf2/nuget/v3/index.json" />
1012
<!-- End: Package sources from dotnet-winforms -->
1113
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1214
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -20,8 +22,10 @@
2022
<disabledPackageSources>
2123
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2224
<!-- Begin: Package sources from dotnet-runtime -->
25+
<add key="darc-int-dotnet-runtime-362ab66" value="true" />
2326
<!-- End: Package sources from dotnet-runtime -->
2427
<!-- Begin: Package sources from dotnet-winforms -->
28+
<add key="darc-int-dotnet-winforms-5f22caf" value="true" />
2529
<!-- End: Package sources from dotnet-winforms -->
2630
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2731
</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.20-servicing.25419.4">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.21-servicing.25475.3">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>8dbcd442e337f1b9b07e689b0252b37051e5b99f</Sha>
6+
<Sha>5f22caf2baf9cfbdf67939e7f9205bd47a41dbed</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.20-servicing.25419.4">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.21-servicing.25475.3">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>8dbcd442e337f1b9b07e689b0252b37051e5b99f</Sha>
10+
<Sha>5f22caf2baf9cfbdf67939e7f9205bd47a41dbed</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.20-servicing.25419.14" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.21-servicing.25475.13" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>574100b692e71fa3426931adf4c1ba42e4ee5213</Sha>
22+
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
2323
</Dependency>
2424
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="8.0.0-rtm.25513.3">
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.20" CoherentParentDependency="Microsoft.Private.Winforms">
32+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.21" CoherentParentDependency="Microsoft.Private.Winforms">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>574100b692e71fa3426931adf4c1ba42e4ee5213</Sha>
34+
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.20" CoherentParentDependency="Microsoft.Private.Winforms">
36+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.21" CoherentParentDependency="Microsoft.Private.Winforms">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
38-
<Sha>574100b692e71fa3426931adf4c1ba42e4ee5213</Sha>
38+
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
3939
</Dependency>
40-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.20-servicing.25419.14" CoherentParentDependency="Microsoft.Private.Winforms">
40+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.21-servicing.25475.13" CoherentParentDependency="Microsoft.Private.Winforms">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
42-
<Sha>574100b692e71fa3426931adf4c1ba42e4ee5213</Sha>
42+
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</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.20">
153+
<Dependency Name="System.Drawing.Common" Version="8.0.21">
154154
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
155-
<Sha>8dbcd442e337f1b9b07e689b0252b37051e5b99f</Sha>
155+
<Sha>5f22caf2baf9cfbdf67939e7f9205bd47a41dbed</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.20-servicing.25419.4</MicrosoftPrivateWinformsVersion>
25+
<MicrosoftPrivateWinformsVersion>8.0.21-servicing.25475.3</MicrosoftPrivateWinformsVersion>
2626
</PropertyGroup>
2727
<!-- Packages that come from https://github.com/dotnet/runtime -->
2828
<PropertyGroup>
29-
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.20-servicing.25419.14</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
30-
<MicrosoftNETCoreAppRefVersion>8.0.20</MicrosoftNETCoreAppRefVersion>
31-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.20</MicrosoftNETCoreAppRuntimewinx64Version>
32-
<MicrosoftNETCorePlatformsVersion>8.0.20-servicing.25419.14</MicrosoftNETCorePlatformsVersion>
29+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.21-servicing.25475.13</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
30+
<MicrosoftNETCoreAppRefVersion>8.0.21</MicrosoftNETCoreAppRefVersion>
31+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.21</MicrosoftNETCoreAppRuntimewinx64Version>
32+
<MicrosoftNETCorePlatformsVersion>8.0.21-servicing.25475.13</MicrosoftNETCorePlatformsVersion>
3333
<SystemCodeDomPackageVersion>8.0.0</SystemCodeDomPackageVersion>
3434
<SystemConfigurationConfigurationManagerPackageVersion>8.0.1</SystemConfigurationConfigurationManagerPackageVersion>
3535
<SystemDiagnosticsEventLogPackageVersion>8.0.2</SystemDiagnosticsEventLogPackageVersion>
36-
<SystemDrawingCommonVersion>8.0.20</SystemDrawingCommonVersion>
36+
<SystemDrawingCommonVersion>8.0.21</SystemDrawingCommonVersion>
3737
<SystemDirectoryServicesVersion>8.0.0</SystemDirectoryServicesVersion>
3838
<SystemIOPackagingVersion>8.0.1</SystemIOPackagingVersion>
3939
<SystemReflectionMetadataLoadContextVersion>8.0.1</SystemReflectionMetadataLoadContextVersion>

0 commit comments

Comments
 (0)