Skip to content

Merging internal commits for release/8.0 #11035

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
harshit7962 merged 23 commits into from
Aug 8, 2025
Merged

Merging internal commits for release/8.0 #11035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
3bb9b26
Merge commit '4189ac0cb05a41f9c18ffc1cce5941f0e36fd50f'
Jun 5, 2025
9ca9f5f
Merge commit 'f63c4db543f20a5d4798ef74eb3a2ddd2e74d918'
Jun 10, 2025
e0e881d
Merge commit '3b00128edf96448887d6418524f2868d8136556e'
Jun 11, 2025
42cd7d2
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jun 12, 2025
c8ef90c
Merged PR 50846: [internal/release/8.0] Update dependencies from dnce…
Jun 13, 2025
480ddbb
Merged PR 50976: [internal/release/8.0] merge public commits
vseanreesermsft Jun 17, 2025
4ea130a
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jul 4, 2025
6ab7f6e
Merge commit 'fe43b656c39ba06d56289369b5b4c00668960b0e'
Jul 7, 2025
ee59218
Merge commit '6d158c26d473eaf31287b572d7b4b28c95697aef'
Jul 9, 2025
b71fac3
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jul 10, 2025
975ab37
Merged PR 51334: [internal/release/8.0] Update dependencies from dnce…
Jul 10, 2025
2081d66
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jul 10, 2025
5588eea
Merged PR 51456: [internal/release/8.0] Update dependencies from dnce…
Jul 11, 2025
ce36515
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jul 16, 2025
1d215be
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jul 16, 2025
0d04b7f
Merged PR 51583: [internal/release/8.0] Update dependencies from dnce…
Jul 17, 2025
3b01072
Update dependencies from https://dev.azure.com/dnceng/internal/_git/d…
dotnet-bot Jul 17, 2025
63b97d9
Merged PR 51690: [internal/release/8.0] Update dependencies from dnce…
Jul 17, 2025
88dbff5
Merged PR 51704: Use servicing queues
mmitche Jul 18, 2025
e2726cb
Pin 1ESPT tag to 7-08 to avoid prefast errors
mmitche Jul 18, 2025
c5094f3
Merged PR 51713: Pin 1ESPT tag to 7-08 to avoid prefast errors
vseanreesermsft Jul 18, 2025
43d1a9a
Merged PR 51714: Merged PR 51704: Use servicing queues
vseanreesermsft Jul 18, 2025
94005e5
Merge commit '43d1a9a5f6207405244e36ac6a2950c8050442f8' into internal…
vseanreesermsft Aug 6, 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
24 changes: 4 additions & 20 deletions NuGet.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,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-ef853a7" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-ef853a71/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-77545d6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-77545d6-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-77545d6-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-77545d6-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-77545d6f-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-runtime-fce8ed9" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-fce8ed90/nuget/v3/index.json" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-92d43c6" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-92d43c65/nuget/v3/index.json" />
<add key="darc-int-dotnet-winforms-f3291ac" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-f3291ace/nuget/v3/index.json" />
<add key="darc-int-dotnet-winforms-f3291ac-3" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-f3291ace-3/nuget/v3/index.json" />
<add key="darc-int-dotnet-winforms-f3291ac-2" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-f3291ace-2/nuget/v3/index.json" />
<add key="darc-int-dotnet-winforms-f3291ac-1" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-f3291ace-1/nuget/v3/index.json" />
<add key="darc-int-dotnet-winforms-1957eae" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-winforms-1957eae5/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 @@ -30,18 +22,10 @@
<disabledPackageSources>
<!--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-77545d6-1" value="true" />
<add key="darc-int-dotnet-runtime-77545d6-2" value="true" />
<add key="darc-int-dotnet-runtime-77545d6-3" value="true" />
<add key="darc-int-dotnet-runtime-77545d6" value="true" />
<add key="darc-int-dotnet-runtime-ef853a7" value="true" />
<add key="darc-int-dotnet-runtime-fce8ed9" value="true" />
<!-- End: Package sources from dotnet-runtime -->
<!-- Begin: Package sources from dotnet-winforms -->
<add key="darc-int-dotnet-winforms-92d43c6" value="true" />
<add key="darc-int-dotnet-winforms-f3291ac-1" value="true" />
<add key="darc-int-dotnet-winforms-f3291ac-2" value="true" />
<add key="darc-int-dotnet-winforms-f3291ac-3" value="true" />
<add key="darc-int-dotnet-winforms-f3291ac" value="true" />
<add key="darc-int-dotnet-winforms-1957eae" 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
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ resources:
- repository: 1ESPipelineTemplates
type: git
name: 1ESPipelineTemplates/1ESPipelineTemplates
ref: refs/tags/release
ref: refs/tags/release-2025-07-08-1
extends:
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
parameters:
Expand Down
28 changes: 14 additions & 14 deletions eng/Version.Details.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Dependencies>
<ProductDependencies>
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.18-servicing.25312.3">
<Dependency Name="Microsoft.Private.Winforms" Version="8.0.19-servicing.25367.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>92d43c655032c60ddf0b3727041e05c93055ee97</Sha>
<Sha>1957eae58462d524ab5ba1ee3b335405082dc05f</Sha>
</Dependency>
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.18-servicing.25312.3">
<Dependency Name="Microsoft.Dotnet.WinForms.ProjectTemplates" Version="8.0.19-servicing.25367.3">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>92d43c655032c60ddf0b3727041e05c93055ee97</Sha>
<Sha>1957eae58462d524ab5ba1ee3b335405082dc05f</Sha>
</Dependency>
<Dependency Name="System.Reflection.MetadataLoadContext" Version="8.0.1" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
Expand All @@ -17,9 +17,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.18-servicing.25311.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.Platforms" Version="8.0.19-servicing.25365.14" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
<Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Wpf.DncEng" Version="8.0.0-rtm.25168.2">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int</Uri>
Expand All @@ -29,17 +29,17 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.18" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Ref" Version="8.0.19" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
<Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
</Dependency>
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.18" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="8.0.19" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
<Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
</Dependency>
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.18-servicing.25311.17" CoherentParentDependency="Microsoft.Private.Winforms">
<Dependency Name="VS.Redist.Common.NetCore.SharedFramework.x64.8.0" Version="8.0.19-servicing.25365.14" CoherentParentDependency="Microsoft.Private.Winforms">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>ef853a71052646a42abf17e888ec6d9a69614ad9</Sha>
<Sha>fce8ed90dc43047eabec2b32c04ee46b789ad5d1</Sha>
</Dependency>
<!-- These dependencies are required by windowsdesktop for coherency. -->
<Dependency Name="Microsoft.Win32.Registry.AccessControl" Version="8.0.0" CoherentParentDependency="Microsoft.Private.Winforms">
Expand Down Expand Up @@ -150,9 +150,9 @@
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-runtime</Uri>
<Sha>5535e31a712343a63f5d7d796cd874e563e5ac14</Sha>
</Dependency>
<Dependency Name="System.Drawing.Common" Version="8.0.18">
<Dependency Name="System.Drawing.Common" Version="8.0.19">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-winforms</Uri>
<Sha>92d43c655032c60ddf0b3727041e05c93055ee97</Sha>
<Sha>1957eae58462d524ab5ba1ee3b335405082dc05f</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down
12 changes: 6 additions & 6 deletions eng/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/winforms -->
<PropertyGroup>
<MicrosoftPrivateWinformsVersion>8.0.18-servicing.25312.3</MicrosoftPrivateWinformsVersion>
<MicrosoftPrivateWinformsVersion>8.0.19-servicing.25367.3</MicrosoftPrivateWinformsVersion>
</PropertyGroup>
<!-- Packages that come from https://github.com/dotnet/runtime -->
<PropertyGroup>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.18-servicing.25311.17</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRefVersion>8.0.18</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.18</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>8.0.18-servicing.25311.17</MicrosoftNETCorePlatformsVersion>
<VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>8.0.19-servicing.25365.14</VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion>
<MicrosoftNETCoreAppRefVersion>8.0.19</MicrosoftNETCoreAppRefVersion>
<MicrosoftNETCoreAppRuntimewinx64Version>8.0.19</MicrosoftNETCoreAppRuntimewinx64Version>
<MicrosoftNETCorePlatformsVersion>8.0.19-servicing.25365.14</MicrosoftNETCorePlatformsVersion>
<SystemCodeDomPackageVersion>8.0.0</SystemCodeDomPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>8.0.1</SystemConfigurationConfigurationManagerPackageVersion>
<SystemDiagnosticsEventLogPackageVersion>8.0.2</SystemDiagnosticsEventLogPackageVersion>
<SystemDrawingCommonVersion>8.0.18</SystemDrawingCommonVersion>
<SystemDrawingCommonVersion>8.0.19</SystemDrawingCommonVersion>
<SystemDirectoryServicesVersion>8.0.0</SystemDirectoryServicesVersion>
<SystemIOPackagingVersion>8.0.1</SystemIOPackagingVersion>
<SystemReflectionMetadataLoadContextVersion>8.0.1</SystemReflectionMetadataLoadContextVersion>
Expand Down
8 changes: 4 additions & 4 deletions eng/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ jobs:
pool:
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Public
demands: ImageOverride -equals windows.vs2022preview.amd64.Open
demands: ImageOverride -equals windows.vs2022.amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals windows.vs2022preview.amd64
demands: ImageOverride -equals windows.vs2022.amd64
helixRepo: $(repoName)
jobs:
- job: Windows_NT
Expand All @@ -41,10 +41,10 @@ jobs:
# agent pool can't be read from a user-defined variable (Azure DevOps limitation)
${{ if eq(variables['System.TeamProject'], 'public') }}:
name: NetCore-Public
demands: ImageOverride -equals windows.vs2022preview.amd64.Open
demands: ImageOverride -equals windows.vs2022.amd64.Open
${{ if eq(variables['System.TeamProject'], 'internal') }}:
name: NetCore1ESPool-Internal
demands: ImageOverride -equals windows.vs2022preview.amd64
demands: ImageOverride -equals windows.vs2022.amd64
variables:
- name: Codeql.Enabled
value: true
Expand Down