Skip to content

Commit 04a7829

Browse files
himgoyalmicrohimgoyalmicro
authored
Merge pull request #10555 from vseanreesermsft/internal-merge-8.0-2025-03-11-1245
Merging internal commits for release/8.0
2 parents 7cf1dca + 440cad8 commit 04a7829

File tree

3 files changed

+24
-42
lines changed

3 files changed

+24
-42
lines changed

‎NuGet.config

Lines changed: 4 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +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-eba546b" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0/nuget/v3/index.json" />
9-
<add key="darc-int-dotnet-runtime-eba546b-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-eba546b0-6/nuget/v3/index.json" />
8+
<add key="darc-int-dotnet-runtime-1584e49" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-1584e493/nuget/v3/index.json" />
109
<!-- End: Package sources from dotnet-runtime -->
1110
<!-- Begin: Package sources from dotnet-winforms -->
12-
<add key="darc-int-dotnet-winforms-ffd0879" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-ffd0879b/nuget/v3/index.json" />
13-
<add key="darc-int-dotnet-winforms-ffd0879-8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-ffd0879b-8/nuget/v3/index.json" />
14-
<add key="darc-int-dotnet-winforms-ffd0879-7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-ffd0879b-7/nuget/v3/index.json" />
15-
<add key="darc-int-dotnet-winforms-ffd0879-6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-ffd0879b-6/nuget/v3/index.json" />
16-
<add key="darc-int-dotnet-winforms-ffd0879-5" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-ffd0879b-5/nuget/v3/index.json" />
17-
<add key="darc-int-dotnet-winforms-ffd0879-4" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-ffd0879b-4/nuget/v3/index.json" />
18-
<add key="darc-int-dotnet-winforms-ffd0879-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-ffd0879b-3/nuget/v3/index.json" />
19-
<add key="darc-int-dotnet-winforms-ffd0879-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-ffd0879b-2/nuget/v3/index.json" />
20-
<add key="darc-int-dotnet-winforms-ffd0879-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-ffd0879b-1/nuget/v3/index.json" />
11+
<add key="darc-int-dotnet-winforms-4218aeb" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-4218aeb9/nuget/v3/index.json" />
2112
<!-- End: Package sources from dotnet-winforms -->
2213
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
2314
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -31,19 +22,10 @@
3122
<disabledPackageSources>
3223
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
3324
<!-- Begin: Package sources from dotnet-runtime -->
34-
<add key="darc-int-dotnet-runtime-eba546b-6" value="true" />
35-
<add key="darc-int-dotnet-runtime-eba546b" value="true" />
25+
<add key="darc-int-dotnet-runtime-1584e49" value="true" />
3626
<!-- End: Package sources from dotnet-runtime -->
3727
<!-- Begin: Package sources from dotnet-winforms -->
38-
<add key="darc-int-dotnet-winforms-ffd0879-1" value="true" />
39-
<add key="darc-int-dotnet-winforms-ffd0879-2" value="true" />
40-
<add key="darc-int-dotnet-winforms-ffd0879-3" value="true" />
41-
<add key="darc-int-dotnet-winforms-ffd0879-4" value="true" />
42-
<add key="darc-int-dotnet-winforms-ffd0879-5" value="true" />
43-
<add key="darc-int-dotnet-winforms-ffd0879-6" value="true" />
44-
<add key="darc-int-dotnet-winforms-ffd0879-7" value="true" />
45-
<add key="darc-int-dotnet-winforms-ffd0879-8" value="true" />
46-
<add key="darc-int-dotnet-winforms-ffd0879" value="true" />
28+
<add key="darc-int-dotnet-winforms-4218aeb" value="true" />
4729
<!-- End: Package sources from dotnet-winforms -->
4830
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
4931
</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.13-servicing.25066.3">
4+
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.14-servicing.25112.9">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
6-
<Sha>ffd0879b7792b899ae8210242a58cdc8529c8e7f</Sha>
6+
<Sha>4218aeb9b6f0ac5d0495185237a47d7bf44dad1f</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.13-servicing.25066.3">
8+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.14-servicing.25112.9">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>ffd0879b7792b899ae8210242a58cdc8529c8e7f</Sha>
10+
<Sha>4218aeb9b6f0ac5d0495185237a47d7bf44dad1f</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.13-servicing.25066.9" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.14-servicing.25111.18" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
22+
<Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
2323
</Dependency>
2424
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="8.0.0-rtm.24365.4">
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.13" CoherentParentDependency="Microsoft.Private.Winforms">
32+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14" CoherentParentDependency="Microsoft.Private.Winforms">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
34-
<Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
34+
<Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.13" CoherentParentDependency="Microsoft.Private.Winforms">
36+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.14" CoherentParentDependency="Microsoft.Private.Winforms">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
38-
<Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
38+
<Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
3939
</Dependency>
40-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.13-servicing.25066.9" CoherentParentDependency="Microsoft.Private.Winforms">
40+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.14-servicing.25111.18" CoherentParentDependency="Microsoft.Private.Winforms">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
42-
<Sha>eba546b0f0d448e0176a2222548fd7a2fbf464c0</Sha>
42+
<Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</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.13">
153+
<Dependency Name="System.Drawing.Common" Version="8.0.14">
154154
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
155-
<Sha>ffd0879b7792b899ae8210242a58cdc8529c8e7f</Sha>
155+
<Sha>4218aeb9b6f0ac5d0495185237a47d7bf44dad1f</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.13-servicing.25066.3</MicrosoftPrivateWinformsVersion>
25+
<MicrosoftPrivateWinformsVersion>8.0.14-servicing.25112.9</MicrosoftPrivateWinformsVersion>
2626
</PropertyGroup>
2727
<!-- Packages that come from https://github.com/dotnet/runtime -->
2828
<PropertyGroup>
29-
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.13-servicing.25066.9</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
30-
<MicrosoftNETCoreAppRefVersion>8.0.13</MicrosoftNETCoreAppRefVersion>
31-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.13</MicrosoftNETCoreAppRuntimewinx64Version>
32-
<MicrosoftNETCorePlatformsVersion>8.0.13-servicing.25066.9</MicrosoftNETCorePlatformsVersion>
29+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.14-servicing.25111.18</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
30+
<MicrosoftNETCoreAppRefVersion>8.0.14</MicrosoftNETCoreAppRefVersion>
31+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.14</MicrosoftNETCoreAppRuntimewinx64Version>
32+
<MicrosoftNETCorePlatformsVersion>8.0.14-servicing.25111.18</MicrosoftNETCorePlatformsVersion>
3333
<SystemCodeDomPackageVersion>8.0.0</SystemCodeDomPackageVersion>
3434
<SystemConfigurationConfigurationManagerPackageVersion>8.0.1</SystemConfigurationConfigurationManagerPackageVersion>
3535
<SystemDiagnosticsEventLogPackageVersion>8.0.1</SystemDiagnosticsEventLogPackageVersion>
36-
<SystemDrawingCommonVersion>8.0.13</SystemDrawingCommonVersion>
36+
<SystemDrawingCommonVersion>8.0.14</SystemDrawingCommonVersion>
3737
<SystemDirectoryServicesVersion>8.0.0</SystemDirectoryServicesVersion>
3838
<SystemIOPackagingVersion>8.0.1</SystemIOPackagingVersion>
3939
<SystemReflectionMetadataLoadContextVersion>8.0.1</SystemReflectionMetadataLoadContextVersion>

0 commit comments

Comments
 (0)