Skip to content

Conversation

@TravisEz13
Copy link
Member

@TravisEz13 TravisEz13 commented Nov 18, 2025

Backport of #26305 to release/v7.6

Triggered by @TravisEz13 on behalf of @pwshBot

Original CL Label: CL-BuildPackaging

/cc @PowerShell/powershell-maintainers

Impact

REQUIRED: Choose either Tooling Impact or Customer Impact (or both). At least one checkbox must be selected.

Tooling Impact

  • Required tooling change
  • Optional tooling change (include reasoning)

Updates .NET SDK to 10.0.100-rc.2.25502.107 and related package references so the v7.6 builds use current tooling; also temporarily disables CodeQL analysis on Linux due to incompatibility with .NET SDK 10-rc.2.

Customer Impact

  • Customer reported
  • Found internally

Regression

REQUIRED: Check exactly one box.

  • Yes
  • No

This is not a regression.

Testing

Verified package updates by reviewing global.json and all modified .csproj files for correct version numbers; confirmed CodeQL comment-out matches master branch pattern; smoke-tested local build with updated SDK to ensure compilation succeeds.

Risk

REQUIRED: Check exactly one box.

  • High
  • Medium
  • Low

Package reference updates are routine maintenance but affect all builds. The CodeQL disabling is temporary and isolated to Linux. Testing confirms builds succeed with the new SDK version.

Merge Conflicts

Two files had conflicts during cherry-pick:

.github/workflows/linux-ci.yml

  • Conflict: The v7.6 branch has a different workflow structure where the analyze job is defined later in the file rather than immediately after xunit_tests
  • Resolution: Kept v7.6 workflow structure; commented out the entire analyze job block (lines 214-270) with the note "Temporarily disable the CodeQL analysis on Linux as it doesn't work for .NET SDK 10-rc.2"; removed - analyze from ready_to_merge needs list (line 232) and replaced with # - analyze
  • Rationale: The intent of the PR is to disable CodeQL on Linux due to SDK incompatibility; applied this change to v7.6's workflow structure while preserving v7.6-specific job ordering

test/xUnit/xUnit.tests.csproj

  • Conflict: Release branch had older package versions (XunitXml.TestLogger 6.1.0, Microsoft.NET.Test.Sdk 17.14.1) vs incoming updates (7.0.2 and 18.0.0)
  • Resolution: Accepted incoming package version updates
  • Rationale: Standard dependency update as part of SDK upgrade

All conflicts resolved by applying the PR's intent (SDK upgrade + CodeQL disable) while respecting v7.6 branch structure.

Copilot AI review requested due to automatic review settings November 18, 2025 00:42
@TravisEz13 TravisEz13 requested review from a team and jshigetomi as code owners November 18, 2025 00:42
@TravisEz13 TravisEz13 added the CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log label Nov 18, 2025
Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR backports package reference updates from the main branch to release/v7.6, upgrading the .NET SDK from version 10.0.100-rc.1.25451.107 to 10.0.100-rc.2.25502.107 and updating related package dependencies. It also temporarily disables CodeQL analysis on Linux due to incompatibility with the new SDK version.

Key Changes:

  • Updated .NET SDK to 10.0.100-rc.2.25502.107 in global.json
  • Updated 40+ package references from rc.1 to rc.2 versions across all .csproj files
  • Upgraded test dependencies (XunitXml.TestLogger 7.0.2, Microsoft.NET.Test.Sdk 18.0.0)
  • Temporarily disabled CodeQL analysis job in Linux CI workflow

Reviewed Changes

Copilot reviewed 14 out of 14 changed files in this pull request and generated 2 comments.

Show a summary per file
File Description
global.json Updated .NET SDK version from 10.0.100-rc.1.25451.107 to rc.2.25502.107
tools/cgmanifest.json Updated 40+ package versions from 9.0.9 to 9.0.10; moved $schema to top of file; added System.Text.Encoding.CodePages entry
test/xUnit/xUnit.tests.csproj Updated XunitXml.TestLogger to 7.0.2 and Microsoft.NET.Test.Sdk to 18.0.0
test/tools/WebListener/WebListener.csproj Updated Microsoft.AspNetCore.Mvc.NewtonsoftJson to rc.2.25502.107
test/tools/TestService/TestService.csproj Updated Microsoft.Windows.Compatibility to rc.2.25502.107
test/tools/TestAlc/nested/Test.Isolated.Nested.csproj Updated System.CommandLine to rc.2.25502.107
src/System.Management.Automation/System.Management.Automation.csproj Updated 6 package references to rc.2.25502.107
src/Microsoft.WSMan.Management/Microsoft.WSMan.Management.csproj Updated System.ServiceProcess.ServiceController to rc.2.25502.107
src/Microsoft.PowerShell.SDK/Microsoft.PowerShell.SDK.csproj Updated 5 package references to rc.2.25502.107
src/Microsoft.PowerShell.CoreCLR.Eventing/Microsoft.PowerShell.CoreCLR.Eventing.csproj Updated System.Diagnostics.EventLog to rc.2.25502.107
src/Microsoft.PowerShell.Commands.Utility/Microsoft.PowerShell.Commands.Utility.csproj Updated Markdig.Signed to 0.43.0 and System.Drawing.Common to rc.2.25502.107; removed System.Threading.AccessControl
src/Microsoft.PowerShell.Commands.Management/Microsoft.PowerShell.Commands.Management.csproj Updated System.ServiceProcess.ServiceController to rc.2.25502.107
src/Microsoft.PowerShell.Commands.Diagnostics/Microsoft.PowerShell.Commands.Diagnostics.csproj Updated System.Diagnostics.PerformanceCounter to rc.2.25502.107
.github/workflows/linux-ci.yml Commented out entire CodeQL analyze job and removed it from ready_to_merge dependencies

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

@TravisEz13 TravisEz13 enabled auto-merge (squash) November 19, 2025 17:56
@TravisEz13 TravisEz13 disabled auto-merge November 19, 2025 18:01
@TravisEz13 TravisEz13 merged commit e9af4e7 into PowerShell:release/v7.6 Nov 19, 2025
44 of 46 checks passed
@TravisEz13 TravisEz13 deleted the backport/release/v7.6/26305-df8fe254b branch November 19, 2025 18:01
@SeeminglyScience
Copy link
Collaborator

LGTM

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants