Skip to content

Merging internal commits for release/8.0 #5026

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Apr 10, 2025
Merged

Merging internal commits for release/8.0 #5026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
cbf6ad9
Merged PR 47757: resolving merge conflicts between release/8.0 and i…
Feb 18, 2025
14b21ae
Merge commit '845bb5223af2e4905d34fcfcde5632a25df35e8f'
Mar 7, 2025
0117c99
[internal/release/8.0] Update dependencies from dnceng/internal/dotne…
Mar 11, 2025
52a4bd3
Merged PR 48360: [internal/release/8.0] Merge from public
vseanreesermsft Mar 12, 2025
e672bbe
Updated Versions.props - BuildTasks/VersionTools 8.0.0-beta.25111.4
vseanreesermsft Mar 12, 2025
7b07eb2
Updated Version.Details.xml arcade deps, 8.0.0-beta.25111.4
vseanreesermsft Mar 12, 2025
6c18a6f
Merged PR 48362: [internal/release/8.0] - Replace Arcade Updates
vseanreesermsft Mar 12, 2025
52fbc9b
Merge commit 'dbd43c6ac6d24767f8103eba6f3e723d79db7111'
Mar 12, 2025
00ec1ea
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 13, 2025
f53fd07
Merged PR 48430: [internal/release/8.0] Update dependencies from dnce…
Mar 14, 2025
97a60dc
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 16, 2025
2705463
Merged PR 48504: [internal/release/8.0] Update dependencies from dnce…
Mar 16, 2025
0de1245
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 17, 2025
d4f37f8
Merged PR 48552: [internal/release/8.0] Update dependencies from dnce…
Mar 17, 2025
f41589d
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Mar 17, 2025
83fc500
Merged PR 48567: [internal/release/8.0] Update dependencies from dnce…
Mar 18, 2025
3730166
Merge commit '83fc500260851a71b62ed3e92e672021624c28da' into internal…
vseanreesermsft Apr 8, 2025
0c061f0
Merge branch 'release/8.0' into internal-merge-8.0-2025-04-08-1205
Tanya-Solyanik Apr 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<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" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<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" />
<!-- End: Package sources from dotnet-winforms -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
Expand All @@ -23,8 +25,10 @@
<clear />
<!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
<!-- Begin: Package sources from dotnet-runtime -->
<add key="darc-int-dotnet-runtime-50c4cb9" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-2c14c37" value="true" />
<!-- End: Package sources from dotnet-winforms -->
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
</disabledPackageSources>
Expand Down
48 changes: 24 additions & 24 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.14-servicing.25111.18" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.15-servicing.25164.13" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.14-servicing.25112.9" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.15-servicing.25165.1" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>4218aeb9b6f0ac5d0495185237a47d7bf44dad1f</Sha>
<Sha>2c14c37b0340b3745b630670a1944d260bf3da57</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.14-servicing.25113.2">
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.15-servicing.25167.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>af059f93ea0cd5b695d098162f0d9b1651adb6a3</Sha>
<Sha>4d5e32859f7dfaca9102a95d111a49d2aa2dbd8c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.14-servicing.25113.2">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.15-servicing.25167.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>af059f93ea0cd5b695d098162f0d9b1651adb6a3</Sha>
<Sha>4d5e32859f7dfaca9102a95d111a49d2aa2dbd8c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.14" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.15" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.14-servicing.25111.18" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.15-servicing.25164.13" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.14" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.15" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>1584e493603cfc4e9b36b77d6d4afe97de6363f9</Sha>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.14-servicing.25112.9" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.15-servicing.25165.1" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>4218aeb9b6f0ac5d0495185237a47d7bf44dad1f</Sha>
<Sha>2c14c37b0340b3745b630670a1944d260bf3da57</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.14-servicing.25113.2">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.15-servicing.25167.9">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>af059f93ea0cd5b695d098162f0d9b1651adb6a3</Sha>
<Sha>4d5e32859f7dfaca9102a95d111a49d2aa2dbd8c</Sha>
</Dependency>
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -65,9 +65,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.EventLog" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.Diagnostics.EventLog" Version="8.0.2" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
</Dependency>
<Dependency Name="System.Diagnostics.PerformanceCounter" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand All @@ -77,9 +77,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>81cabf2857a01351e5ab578947c7403a5b128ad1</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices.Protocols" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="System.DirectoryServices.Protocols" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
<Sha>50c4cb9fc31c47f03eac865d7bc518af173b74b7</Sha>
</Dependency>
<Dependency Name="System.DirectoryServices" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand Down Expand Up @@ -145,9 +145,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="8.0.14" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="System.Drawing.Common" Version="8.0.15" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>4218aeb9b6f0ac5d0495185237a47d7bf44dad1f</Sha>
<Sha>2c14c37b0340b3745b630670a1944d260bf3da57</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
22 changes: 11 additions & 11 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@
<!-- nuget -->
<NugetPackagingVersion>6.2.4</NugetPackagingVersion>
<!-- runtime -->
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.14-servicing.25111.18</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<MicrosoftNETCoreAppRefVersion>8.0.14</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.14</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.15-servicing.25164.13</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<MicrosoftNETCoreAppRefVersion>8.0.15</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.15</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftWin32RegistryAccessControlVersion>8.0.0</MicrosoftWin32RegistryAccessControlVersion>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
<MicrosoftWin32SystemEventsVersion>8.0.0</MicrosoftWin32SystemEventsVersion>
Expand All @@ -37,10 +37,10 @@
<SystemConfigurationConfigurationManagerVersion>8.0.1</SystemConfigurationConfigurationManagerVersion>
<SystemDataOdbcVersion>8.0.1</SystemDataOdbcVersion>
<SystemDataOleDbVersion>8.0.1</SystemDataOleDbVersion>
<SystemDiagnosticsEventLogVersion>8.0.1</SystemDiagnosticsEventLogVersion>
<SystemDiagnosticsEventLogVersion>8.0.2</SystemDiagnosticsEventLogVersion>
<SystemDiagnosticsPerformanceCounterVersion>8.0.1</SystemDiagnosticsPerformanceCounterVersion>
<SystemDirectoryServicesAccountManagementVersion>8.0.1</SystemDirectoryServicesAccountManagementVersion>
<SystemDirectoryServicesProtocolsVersion>8.0.0</SystemDirectoryServicesProtocolsVersion>
<SystemDirectoryServicesProtocolsVersion>8.0.1</SystemDirectoryServicesProtocolsVersion>
<SystemDirectoryServicesVersion>8.0.0</SystemDirectoryServicesVersion>
<SystemIOFileSystemAccessControlVersion>5.0.0</SystemIOFileSystemAccessControlVersion>
<SystemIOPackagingVersion>8.0.1</SystemIOPackagingVersion>
Expand All @@ -61,15 +61,15 @@
<SystemSpeechVersion>8.0.0</SystemSpeechVersion>
<SystemTextEncodingCodePagesVersion>8.0.0</SystemTextEncodingCodePagesVersion>
<SystemThreadingAccessControlVersion>8.0.0</SystemThreadingAccessControlVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.14-servicing.25111.18</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.15-servicing.25164.13</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<!-- wcf -->
<SystemServiceModelVersion>4.10.0</SystemServiceModelVersion>
<!-- winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.14-servicing.25112.9</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftPrivateWinformsVersion>8.0.14-servicing.25112.9</MicrosoftPrivateWinformsVersion>
<SystemDrawingCommonVersion>8.0.14</SystemDrawingCommonVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.15-servicing.25165.1</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftPrivateWinformsVersion>8.0.15-servicing.25165.1</MicrosoftPrivateWinformsVersion>
<SystemDrawingCommonVersion>8.0.15</SystemDrawingCommonVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubVersion>8.0.14-servicing.25113.2</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.14-servicing.25113.2</MicrosoftDotNetWpfProjectTemplatesVersion>
<MicrosoftDotNetWpfGitHubVersion>8.0.15-servicing.25167.9</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.15-servicing.25167.9</MicrosoftDotNetWpfProjectTemplatesVersion>
</PropertyGroup>
</Project>