Skip to content

Revert "Trim docs using pwsh via dotnet tool to support cross-platform local development."#4127

Merged
mdaigle merged 1 commit intomainfrom
revert-4121-dev/mdaigle/pwsh-via-dotnet-tool
Apr 1, 2026
Merged

Revert "Trim docs using pwsh via dotnet tool to support cross-platform local development."#4127
mdaigle merged 1 commit intomainfrom
revert-4121-dev/mdaigle/pwsh-via-dotnet-tool

Conversation

@mdaigle
Copy link
Copy Markdown
Contributor

@mdaigle mdaigle commented Apr 1, 2026

Reverts #4121

Copilot AI review requested due to automatic review settings April 1, 2026 16:04
@github-project-automation github-project-automation bot moved this to To triage in SqlClient Board Apr 1, 2026
@mdaigle mdaigle marked this pull request as ready for review April 1, 2026 16:04
@mdaigle mdaigle requested a review from a team as a code owner April 1, 2026 16:04
@mdaigle mdaigle added this to the 7.1.0-preview1 milestone Apr 1, 2026
Copy link
Copy Markdown
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 reverts #4121 by removing the repository-local pwsh dotnet tool usage for doc trimming and returning to invoking system PowerShell (powershell.exe on Windows, pwsh elsewhere) during reference-assembly doc generation.

Changes:

  • Replaces dotnet tool run pwsh + dotnet tool restore usage with direct powershell.exe/pwsh invocations.
  • Removes the RestoreTools target dependency from the ref csproj’s TrimDocs step.
  • Drops the powershell entry from dotnet-tools.json.

Reviewed changes

Copilot reviewed 3 out of 3 changed files in this pull request and generated 1 comment.

File Description
tools/targets/TrimDocsForIntelliSense.targets Reverts doc-trimming execution to call system PowerShell instead of dotnet tool pwsh.
src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj Removes tool-restore dependency and builds a PowerShell command using system powershell.exe/pwsh.
dotnet-tools.json Removes the powershell dotnet tool registration.
Comments suppressed due to low confidence (1)

src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj:58

  • -Command "$(RepoRoot)tools\\intellisense\\TrimDocs.ps1 ..." does not quote/invoke the script path. Repos checked out under a path containing spaces can cause PowerShell to parse the script path incorrectly and fail the build. Prefer -File (with a quoted script path) or -Command with & and a quoted script path.
      <PowerShellCommand>
        $(PowerShellCommand)
          -NonInteractive
          -ExecutionPolicy Unrestricted
          -Command "$(RepoRoot)tools\intellisense\TrimDocs.ps1 -inputFile '$(DocumentationFile)' -outputFile '$(DocumentationFile)'"
      </PowerShellCommand>

@mdaigle mdaigle enabled auto-merge (squash) April 1, 2026 16:43
@mdaigle mdaigle merged commit 4e1d0d4 into main Apr 1, 2026
303 of 304 checks passed
@mdaigle mdaigle deleted the revert-4121-dev/mdaigle/pwsh-via-dotnet-tool branch April 1, 2026 18:20
@github-project-automation github-project-automation bot moved this from To triage to Done in SqlClient Board Apr 1, 2026
@codecov
Copy link
Copy Markdown

codecov bot commented Apr 1, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 66.52%. Comparing base (60d4b92) to head (047d3f9).
⚠️ Report is 14 commits behind head on main.

❗ There is a different number of reports uploaded between BASE (60d4b92) and HEAD (047d3f9). Click for more details.

HEAD has 1 upload less than BASE
Flag BASE (60d4b92) HEAD (047d3f9)
CI-SqlClient 1 0
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #4127      +/-   ##
==========================================
- Coverage   73.22%   66.52%   -6.71%     
==========================================
  Files         280      274       -6     
  Lines       43000    65781   +22781     
==========================================
+ Hits        31486    43758   +12272     
- Misses      11514    22023   +10509     
Flag Coverage Δ
CI-SqlClient ?
PR-SqlClient-Project 66.52% <ø> (?)

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

paulmedynski pushed a commit that referenced this pull request Apr 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

4 participants