Skip to content

Merging internal commits for release/8.0 #5341

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 20 commits into from
Oct 15, 2025
Merged

Merging internal commits for release/8.0 #5341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
0de8b41
Merge commit 'f253c4bf7b4b5a1d84ff5a4d5962b881fcf9beed'
Sep 3, 2025
39b632d
Merge commit '6b27b357e2083119f3dbe88709f5b1b913ce4cc0'
Sep 10, 2025
b49cdf7
Merge commit '27af1b95ac9a84fc5e4251e2b0d19156c5d45f40'
Sep 12, 2025
0dabaa8
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 16, 2025
0ea78ae
Merged PR 53380: [internal/release/8.0] Update dependencies from dnce…
Sep 17, 2025
bbe622f
fix microbuild add service connection id.
vseanreesermsft Sep 20, 2025
20574c2
Merged PR 53559: fix microbuild add service connection id.
vseanreesermsft Sep 20, 2025
54ccc41
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 22, 2025
38da98c
Merged PR 53566: [internal/release/8.0] Update dependencies from dnce…
Sep 22, 2025
5c4cb0f
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 23, 2025
3c0e64b
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 23, 2025
cccd18c
Merged PR 53630: [internal/release/8.0] Update dependencies from dnce…
Sep 23, 2025
bd7fc99
Merged PR 53660: [internal/release/8.0] Merge from public
mmitche Sep 23, 2025
6f8e18a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 24, 2025
a56d486
Merged PR 53664: [internal/release/8.0] Update dependencies from dnce…
Sep 24, 2025
2d45d16
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 24, 2025
ce51e94
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Sep 24, 2025
0794008
Merged PR 53735: [internal/release/8.0] Update dependencies from dnce…
Sep 24, 2025
74e82c7
Merged PR 53807: [internal/release/8.0] Update dependencies from dnce…
Sep 26, 2025
dced7bc
Merge commit '74e82c7a451f7350b264b64f8ea43fde017ec0af' into internal…
vseanreesermsft Oct 14, 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-362ab66" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-362ab666/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<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" />
<!-- 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-362ab66" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-5f22caf" 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
40 changes: 20 additions & 20 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.20-servicing.25419.14" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.Internal.Runtime.WindowsDesktop.Transport" Version="8.0.21-servicing.25475.13" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>574100b692e71fa3426931adf4c1ba42e4ee5213</Sha>
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
</Dependency>
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.20-servicing.25419.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.21-servicing.25475.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>8dbcd442e337f1b9b07e689b0252b37051e5b99f</Sha>
<Sha>5f22caf2baf9cfbdf67939e7f9205bd47a41dbed</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.20-servicing.25420.2">
<Dependency Name="Microsoft.DotNet.Wpf.GitHub" Version="8.0.21-servicing.25475.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>7b95ca673ef08b7325429a3b675184b815482564</Sha>
<Sha>3ff72f664fd6e585b4b61fe5d79f33255aca5d6c</Sha>
</Dependency>
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.20-servicing.25420.2">
<Dependency Name="Microsoft.NET.Sdk.WindowsDesktop" Version="8.0.21-servicing.25475.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>7b95ca673ef08b7325429a3b675184b815482564</Sha>
<Sha>3ff72f664fd6e585b4b61fe5d79f33255aca5d6c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.20" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.21" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>574100b692e71fa3426931adf4c1ba42e4ee5213</Sha>
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.20-servicing.25419.14" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.21-servicing.25475.13" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>574100b692e71fa3426931adf4c1ba42e4ee5213</Sha>
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.20" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.21" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>574100b692e71fa3426931adf4c1ba42e4ee5213</Sha>
<Sha>362ab6669d55a75d51166f01b596c967c734ef4c</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.20-servicing.25419.4" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.21-servicing.25475.3" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>8dbcd442e337f1b9b07e689b0252b37051e5b99f</Sha>
<Sha>5f22caf2baf9cfbdf67939e7f9205bd47a41dbed</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.20-servicing.25420.2">
<Dependency Name="Microsoft.DotNet.Wpf.ProjectTemplates" Version="8.0.21-servicing.25475.4">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf</Uri>
<Sha>7b95ca673ef08b7325429a3b675184b815482564</Sha>
<Sha>3ff72f664fd6e585b4b61fe5d79f33255aca5d6c</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 @@ -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.20" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Dependency Name="System.Drawing.Common" Version="8.0.21" CoherentParentDependency="Microsoft.DotNet.Wpf.GitHub">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>8dbcd442e337f1b9b07e689b0252b37051e5b99f</Sha>
<Sha>5f22caf2baf9cfbdf67939e7f9205bd47a41dbed</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
18 changes: 9 additions & 9 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.20-servicing.25419.14</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<MicrosoftNETCoreAppRefVersion>8.0.20</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.20</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftInternalRuntimeWindowsDesktopTransportVersion>8.0.21-servicing.25475.13</MicrosoftInternalRuntimeWindowsDesktopTransportVersion>
<MicrosoftNETCoreAppRefVersion>8.0.21</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.21</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftWin32RegistryAccessControlVersion>8.0.0</MicrosoftWin32RegistryAccessControlVersion>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
<MicrosoftWin32SystemEventsVersion>8.0.0</MicrosoftWin32SystemEventsVersion>
Expand Down Expand Up @@ -61,15 +61,15 @@
<SystemSpeechVersion>8.0.0</SystemSpeechVersion>
<SystemTextEncodingCodePagesVersion>8.0.0</SystemTextEncodingCodePagesVersion>
<SystemThreadingAccessControlVersion>8.0.0</SystemThreadingAccessControlVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.20-servicing.25419.14</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.21-servicing.25475.13</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<!-- wcf -->
<SystemServiceModelVersion>4.10.3</SystemServiceModelVersion>
<!-- winforms -->
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.20-servicing.25419.4</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftPrivateWinformsVersion>8.0.20-servicing.25419.4</MicrosoftPrivateWinformsVersion>
<SystemDrawingCommonVersion>8.0.20</SystemDrawingCommonVersion>
<MicrosoftDotnetWinFormsProjectTemplatesVersion>8.0.21-servicing.25475.3</MicrosoftDotnetWinFormsProjectTemplatesVersion>
<MicrosoftPrivateWinformsVersion>8.0.21-servicing.25475.3</MicrosoftPrivateWinformsVersion>
<SystemDrawingCommonVersion>8.0.21</SystemDrawingCommonVersion>
<!-- wpf -->
<MicrosoftDotNetWpfGitHubVersion>8.0.20-servicing.25420.2</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.20-servicing.25420.2</MicrosoftDotNetWpfProjectTemplatesVersion>
<MicrosoftDotNetWpfGitHubVersion>8.0.21-servicing.25475.4</MicrosoftDotNetWpfGitHubVersion>
<MicrosoftDotNetWpfProjectTemplatesVersion>8.0.21-servicing.25475.4</MicrosoftDotNetWpfProjectTemplatesVersion>
</PropertyGroup>
</Project>
1 change: 1 addition & 0 deletions eng/pipelines/jobs/prepare-signed-artifacts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ jobs:
signType: $(SignType)
zipSources: false
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
condition: and(succeeded(), in(variables['SignType'], 'real', 'test'))
- task: DownloadBuildArtifacts@0
displayName: Download IntermediateUnsignedArtifacts
Expand Down
Loading