Skip to content

Commit f7fc0a8

Browse files
Tanya-SolyanikTanya-Solyanik
authored
Merge pull request #5026 from vseanreesermsft/internal-merge-8.0-2025-04-08-1205
Merging internal commits for release/8.0
2 parents cdec9c8 + 0c061f0 commit f7fc0a8

File tree

3 files changed

+39
-35
lines changed

3 files changed

+39
-35
lines changed

‎NuGet.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@
99
<clear />
1010
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
1111
<!-- Begin: Package sources from dotnet-runtime -->
12+
<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" />
1213
<!-- End: Package sources from dotnet-runtime -->
1314
<!-- Begin: Package sources from dotnet-winforms -->
15+
<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" />
1416
<!-- End: Package sources from dotnet-winforms -->
1517
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1618
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -23,8 +25,10 @@
2325
<clear />
2426
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
2527
<!-- Begin: Package sources from dotnet-runtime -->
28+
<add key="darc-int-dotnet-runtime-50c4cb9" value="true" />
2629
<!-- End: Package sources from dotnet-runtime -->
2730
<!-- Begin: Package sources from dotnet-winforms -->
31+
<add key="darc-int-dotnet-winforms-2c14c37" value="true" />
2832
<!-- End: Package sources from dotnet-winforms -->
2933
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
3034
</disabledPackageSources>

‎eng/Version.Details.xml‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,41 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.14-servicing.25111.18" CoherentParentDependency="Microsoft.Private.Winforms">
4+
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.15-servicing.25164.13" CoherentParentDependency="Microsoft.Private.Winforms">
55
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6-
<Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
6+
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.14-servicing.25112.9" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
8+
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.15-servicing.25165.1" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
99
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
10-
<Sha>4218aeb9b6f0ac5d0495185237a47d7bf44dad1f</Sha>
10+
<Sha>2c14c37b0340b3745b630670a1944d260bf3da57</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.14-servicing.25113.2">
12+
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.15-servicing.25167.9">
1313
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
14-
<Sha>af059f93ea0cd5b695d098162f0d9b1651adb6a3</Sha>
14+
<Sha>4d5e32859f7dfaca9102a95d111a49d2aa2dbd8c</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.14-servicing.25113.2">
16+
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.15-servicing.25167.9">
1717
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
18-
<Sha>af059f93ea0cd5b695d098162f0d9b1651adb6a3</Sha>
18+
<Sha>4d5e32859f7dfaca9102a95d111a49d2aa2dbd8c</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14" CoherentParentDependency="Microsoft.Private.Winforms">
20+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.15" CoherentParentDependency="Microsoft.Private.Winforms">
2121
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
22-
<Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
22+
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
2323
</Dependency>
24-
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.14-servicing.25111.18" CoherentParentDependency="Microsoft.Private.Winforms">
24+
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.15-servicing.25164.13" CoherentParentDependency="Microsoft.Private.Winforms">
2525
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
26-
<Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
26+
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.14" CoherentParentDependency="Microsoft.Private.Winforms">
28+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.15" CoherentParentDependency="Microsoft.Private.Winforms">
2929
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
30-
<Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
30+
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.14-servicing.25112.9" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
32+
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.15-servicing.25165.1" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
3333
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
34-
<Sha>4218aeb9b6f0ac5d0495185237a47d7bf44dad1f</Sha>
34+
<Sha>2c14c37b0340b3745b630670a1944d260bf3da57</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.14-servicing.25113.2">
36+
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.15-servicing.25167.9">
3737
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
38-
<Sha>af059f93ea0cd5b695d098162f0d9b1651adb6a3</Sha>
38+
<Sha>4d5e32859f7dfaca9102a95d111a49d2aa2dbd8c</Sha>
3939
</Dependency>
4040
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
4141
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -65,9 +65,9 @@
6565
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
6666
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
6767
</Dependency>
68-
<Dependency Name="System.Diagnostics.EventLog" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
68+
<Dependency Name="System.Diagnostics.EventLog" Version="8.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
6969
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
70-
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
70+
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
7171
</Dependency>
7272
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
7373
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -77,9 +77,9 @@
7777
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
7878
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
7979
</Dependency>
80-
<Dependency Name="System.DirectoryServices.Protocols" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
80+
<Dependency Name="System.DirectoryServices.Protocols" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
8181
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
82-
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
82+
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
8383
</Dependency>
8484
<Dependency Name="System.DirectoryServices" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
8585
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
@@ -145,9 +145,9 @@
145145
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
146146
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
147147
</Dependency>
148-
<Dependency Name="System.Drawing.Common" Version="8.0.14" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
148+
<Dependency Name="System.Drawing.Common" Version="8.0.15" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
149149
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
150-
<Sha>4218aeb9b6f0ac5d0495185237a47d7bf44dad1f</Sha>
150+
<Sha>2c14c37b0340b3745b630670a1944d260bf3da57</Sha>
151151
</Dependency>
152152
</ProductDependencies>
153153
<ToolsetDependencies>

‎eng/Versions.props‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
<!-- nuget -->
2626
<NugetPackagingVersion>6.2.4</NugetPackagingVersion>
2727
<!-- runtime -->
28-
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.14-servicing.25111.18</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
29-
<MicrosoftNETCoreAppRefVersion>8.0.14</MicrosoftNETCoreAppRefVersion>
30-
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.14</MicrosoftNETCoreAppRuntimewinx64Version>
28+
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.15-servicing.25164.13</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
29+
<MicrosoftNETCoreAppRefVersion>8.0.15</MicrosoftNETCoreAppRefVersion>
30+
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.15</MicrosoftNETCoreAppRuntimewinx64Version>
3131
<MicrosoftWin32RegistryAccessControlVersion>8.0.0</MicrosoftWin32RegistryAccessControlVersion>
3232
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
3333
<MicrosoftWin32SystemEventsVersion>8.0.0</MicrosoftWin32SystemEventsVersion>
@@ -37,10 +37,10 @@
3737
<SystemConfigurationConfigurationManagerVersion>8.0.1</SystemConfigurationConfigurationManagerVersion>
3838
<SystemDataOdbcVersion>8.0.1</SystemDataOdbcVersion>
3939
<SystemDataOleDbVersion>8.0.1</SystemDataOleDbVersion>
40-
<SystemDiagnosticsEventLogVersion>8.0.1</SystemDiagnosticsEventLogVersion>
40+
<SystemDiagnosticsEventLogVersion>8.0.2</SystemDiagnosticsEventLogVersion>
4141
<SystemDiagnosticsPerformanceCounterVersion>8.0.1</SystemDiagnosticsPerformanceCounterVersion>
4242
<SystemDirectoryServicesAccountManagementVersion>8.0.1</SystemDirectoryServicesAccountManagementVersion>
43-
<SystemDirectoryServicesProtocolsVersion>8.0.0</SystemDirectoryServicesProtocolsVersion>
43+
<SystemDirectoryServicesProtocolsVersion>8.0.1</SystemDirectoryServicesProtocolsVersion>
4444
<SystemDirectoryServicesVersion>8.0.0</SystemDirectoryServicesVersion>
4545
<SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
4646
<SystemIOPackagingVersion>8.0.1</SystemIOPackagingVersion>
@@ -61,15 +61,15 @@
6161
<SystemSpeechVersion>8.0.0</SystemSpeechVersion>
6262
<SystemTextEncodingCodePagesVersion>8.0.0</SystemTextEncodingCodePagesVersion>
6363
<SystemThreadingAccessControlVersion>8.0.0</SystemThreadingAccessControlVersion>
64-
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.14-servicing.25111.18</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
64+
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.15-servicing.25164.13</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
6565
<!-- wcf -->
6666
<SystemServiceModelVersion>4.10.0</SystemServiceModelVersion>
6767
<!-- winforms -->
68-
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.14-servicing.25112.9</MicrosoftDotnetWinFormsProjectTemplatesVersion>
69-
<MicrosoftPrivateWinformsVersion>8.0.14-servicing.25112.9</MicrosoftPrivateWinformsVersion>
70-
<SystemDrawingCommonVersion>8.0.14</SystemDrawingCommonVersion>
68+
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.15-servicing.25165.1</MicrosoftDotnetWinFormsProjectTemplatesVersion>
69+
<MicrosoftPrivateWinformsVersion>8.0.15-servicing.25165.1</MicrosoftPrivateWinformsVersion>
70+
<SystemDrawingCommonVersion>8.0.15</SystemDrawingCommonVersion>
7171
<!-- wpf -->
72-
<MicrosoftDotNetWpfGitHubVersion>8.0.14-servicing.25113.2</MicrosoftDotNetWpfGitHubVersion>
73-
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.14-servicing.25113.2</MicrosoftDotNetWpfProjectTemplatesVersion>
72+
<MicrosoftDotNetWpfGitHubVersion>8.0.15-servicing.25167.9</MicrosoftDotNetWpfGitHubVersion>
73+
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.15-servicing.25167.9</MicrosoftDotNetWpfProjectTemplatesVersion>
7474
</PropertyGroup>
7575
</Project>

0 commit comments

Comments
 (0)