Fix `vs2022` Image rejecting preview sdks, failing to resolve sdks #51558

nagilson · 2025-11-04T18:49:01Z

resolves #51525,

VS uses the local appdata, VS versioned folder, sdk.txt file to determine whether or not to accept preview sdks
VS Release rejects preview SDKs by default which causes the msbuild sdk resolver to not find sdks, as msbuild respects the vs settings
This changes the vs settings to enable our internal SDKs to be found by msbuild when it's going under test.
Arcade doesn't fallback to the global VS if the vs requirements is missing, but it should, so changed this
Possible improvements: this PR assumes sdk.txt content ordering does not matter - based on VS src code this appears to be true but could change in the future

Also tried:

modifying global.json to enable preview sdks, which was not enough. some tests have a custom global.json and it seems to not take precedence
setting env vars such as msbuildsdks which did not take precedence over the vs setting.

build/RunTestsOnHelix.cmd

nagilson · 2025-11-06T22:48:04Z

I was working in another PR to test multiple options at once: #51591
Looks like I got it to work. The ❌ is there due to some mac SSL issues in the template engine. I'll clean up this PR.
Then I'll backport it. Then, I'll push a change to see if Arcade would accept a change for this.

I edited the json wrong in dotnet#51558. If this is all that's needed, the fix can be simpler. I think this likely isn't the case since there are tests with a custom global.json file, but it's worth trying.

- VS uses the local appdata, VS versioned folder, sdk.txt file to determine whether or not to accept preview sdks - VS Release rejects preview SDKs by default which causes the msbuild sdk resolver to not find sdks, as msbuild respects the vs settings - This changes the vs settings to enable our internal SDKs to be found by msbuild when it's going under test. - Possible improvements: this PR assumes sdk.txt content ordering does not matter - based on VS code this appears to be true but could change in the future Also tried: - modifying global.json to enable preview sdks, which was not enough. some tests have a custom global.json and it seems to not take precedence setting env vars such as msbuildsdks which did not take precedence over the vs setting This commit is a condensed version of the work done in dotnet#51591 and dotnet#51598

nagilson · 2025-11-07T19:54:08Z

/backport to release/9.0.1xx

nagilson · 2025-11-07T19:54:15Z

/backport to release/8.0.3xx

github-actions · 2025-11-07T19:54:18Z

Started backporting to release/9.0.1xx (link to workflow run)

github-actions · 2025-11-07T19:54:55Z

@nagilson backporting to release/8.0.3xx failed, the patch most likely resulted in conflicts. Please backport manually!

git am output

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Set sdk.txt file to enable preview SDKs
Using index info to reconstruct a base tree...
M	build/RunTestsOnHelix.cmd
Falling back to patching base and 3-way merge...
Auto-merging build/RunTestsOnHelix.cmd
CONFLICT (content): Merge conflict in build/RunTestsOnHelix.cmd
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Set sdk.txt file to enable preview SDKs
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

github-actions · 2025-11-07T19:55:06Z

@nagilson backporting to release/8.0.4xx failed, the patch most likely resulted in conflicts. Please backport manually!

git am output

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Set sdk.txt file to enable preview SDKs
Using index info to reconstruct a base tree...
M	build/RunTestsOnHelix.cmd
Falling back to patching base and 3-way merge...
Auto-merging build/RunTestsOnHelix.cmd
CONFLICT (content): Merge conflict in build/RunTestsOnHelix.cmd
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Set sdk.txt file to enable preview SDKs
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

github-actions · 2025-11-07T19:55:11Z

@nagilson backporting to release/8.0.1xx failed, the patch most likely resulted in conflicts. Please backport manually!

git am output

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Set sdk.txt file to enable preview SDKs
Using index info to reconstruct a base tree...
M	build/RunTestsOnHelix.cmd
Falling back to patching base and 3-way merge...
Auto-merging build/RunTestsOnHelix.cmd
CONFLICT (content): Merge conflict in build/RunTestsOnHelix.cmd
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Set sdk.txt file to enable preview SDKs
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

eng/enable-preview-sdks.ps1

nagilson · 2025-11-07T22:34:22Z

/backport to release/9.0.1xx

github-actions · 2025-11-07T22:34:30Z

Started backporting to release/9.0.1xx (link to workflow run)

Co-authored-by: nagilson <23152278+nagilson@users.noreply.github.com>

nagilson · 2025-11-07T23:51:35Z

I suppose we might want to fix this for when vs 2026 goes into release

nagilson · 2025-11-07T23:51:42Z

/backport to release/10.0.1xx

nagilson · 2025-11-07T23:51:50Z

/backport to release/10.0.2xx

github-actions · 2025-11-07T23:51:52Z

Started backporting to release/10.0.1xx (link to workflow run)

nagilson · 2025-11-07T23:51:55Z

/backport to main

github-actions · 2025-11-07T23:51:58Z

Started backporting to release/10.0.2xx (link to workflow run)

github-actions · 2025-11-07T23:52:04Z

Started backporting to main (link to workflow run)

github-actions · 2025-11-07T23:52:20Z

@nagilson backporting to release/10.0.1xx failed, the patch most likely resulted in conflicts. Please backport manually!

git am output

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Set sdk.txt file to enable preview SDKs
Applying: Get global json tools vs by default when locating VS
Using index info to reconstruct a base tree...
M	eng/common/tools.ps1
Falling back to patching base and 3-way merge...
Auto-merging eng/common/tools.ps1
CONFLICT (content): Merge conflict in eng/common/tools.ps1
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0002 Get global json tools vs by default when locating VS
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

github-actions · 2025-11-07T23:52:34Z

@nagilson backporting to main failed, the patch most likely resulted in conflicts. Please backport manually!

git am output

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Set sdk.txt file to enable preview SDKs
Applying: Get global json tools vs by default when locating VS
Using index info to reconstruct a base tree...
M	eng/common/tools.ps1
Falling back to patching base and 3-way merge...
Auto-merging eng/common/tools.ps1
CONFLICT (content): Merge conflict in eng/common/tools.ps1
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0002 Get global json tools vs by default when locating VS
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

github-actions · 2025-11-07T23:52:46Z

@nagilson backporting to release/10.0.2xx failed, the patch most likely resulted in conflicts. Please backport manually!

git am output

$ git am --3way --empty=keep --ignore-whitespace --keep-non-patch changes.patch

Applying: Set sdk.txt file to enable preview SDKs
Applying: Get global json tools vs by default when locating VS
Using index info to reconstruct a base tree...
M	eng/common/tools.ps1
Falling back to patching base and 3-way merge...
Auto-merging eng/common/tools.ps1
CONFLICT (content): Merge conflict in eng/common/tools.ps1
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0002 Get global json tools vs by default when locating VS
Error: The process '/usr/bin/git' failed with exit code 128

Link to workflow output

nagilson · 2025-11-07T23:56:16Z

Actually, we've informed Arcade and they can fix all of the repos, so I think the urgency of pushing this to 10 / 11 is not needed.

…#51628)

Youssef1313 reviewed Nov 4, 2025

View reviewed changes

build/RunTestsOnHelix.cmd Outdated Show resolved Hide resolved

This was referenced Nov 4, 2025

Update branding to 8.0.123 #51552

Merged

Update branding to 8.0.320 #51553

Merged

Update branding to 8.0.417 #51554

Merged

Update branding to 9.0.308 #51556

Merged

nagilson commented Nov 4, 2025

View reviewed changes

build/RunTestsOnHelix.cmd Outdated Show resolved Hide resolved

build-analysis bot mentioned this pull request Nov 4, 2025

Could Not Resolve SDK - repo testfx issue #51530

Open

nagilson commented Nov 4, 2025

View reviewed changes

build/RunTestsOnHelix.cmd Outdated Show resolved Hide resolved

nagilson mentioned this pull request Nov 6, 2025

Try fixing rejection of preview SDK #51591

Closed

Youssef1313 reviewed Nov 6, 2025

View reviewed changes

build/RunTestsOnHelix.cmd Outdated Show resolved Hide resolved

build-analysis bot mentioned this pull request Nov 6, 2025

Certificate issues when Sending To Helix from Apple platforms dotnet/dnceng#6410

Open

nagilson mentioned this pull request Nov 6, 2025

Explore if allowPrerelease fixes vs22 preview rejections #51598

Closed

This was referenced Nov 7, 2025

Known Test Repository Issue Sometimes Misses Test Failures dotnet/dnceng#6411

Open

Microsoft.DotNet.Watch.UnitTests.FileWatcherTests.DeleteSubfolder has flaky test assertion #49233

Open

nagilson force-pushed the nagilson-vs-rejects-previews-903 branch from d111492 to 665cdcb Compare November 7, 2025 19:53

nagilson enabled auto-merge November 7, 2025 19:54

github-actions bot mentioned this pull request Nov 7, 2025

[release/9.0.1xx] Fix vs2022 Image rejecting preview sdks, failing to resolve sdks #51621

Merged

nagilson requested a review from a team November 7, 2025 19:57

Get global json tools vs by default when locating VS

7ac423c

MiYanni approved these changes Nov 7, 2025

View reviewed changes

eng/enable-preview-sdks.ps1 Show resolved Hide resolved

nagilson merged commit 622f19c into dotnet:release/9.0.3xx Nov 7, 2025
26 of 29 checks passed

Copilot AI mentioned this pull request Nov 7, 2025

Backport VS Release Images fix to release/8.0.4xx #51626

Merged

Copilot AI added a commit that referenced this pull request Nov 7, 2025

Backport VS Release Images fix from PR #51558

0eb24cf

Co-authored-by: nagilson <23152278+nagilson@users.noreply.github.com>

This was referenced Nov 7, 2025

Backport: Fix VS Release rejecting preview SDKs on Helix test machines #51630

Merged

Backport #51558: Fix VS rejecting preview SDKs on Helix test machines #51628

Merged

Copilot AI added a commit that referenced this pull request Nov 7, 2025

Backport PR #51558: Fix VS2022 rejecting preview SDKs

a4a2cac

Co-authored-by: nagilson <23152278+nagilson@users.noreply.github.com>

This was referenced Nov 7, 2025

[release/9.0.1xx] Update dependencies from dotnet/arcade #51606

Open

[release/9.0.3xx] Update dependencies from dotnet/arcade #51607

Open

[release/9.0.1xx] Update dependencies from dotnet/templating #51611

Open

nagilson added a commit that referenced this pull request Nov 10, 2025

Backport #51558: Fix VS rejecting preview SDKs on Helix test machines (…

e586cf3

…#51628)

Fix vs2022 Image rejecting preview sdks, failing to resolve sdks #51558

Fix vs2022 Image rejecting preview sdks, failing to resolve sdks #51558

Conversation

nagilson commented Nov 4, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nagilson commented Nov 6, 2025

Uh oh!

nagilson commented Nov 7, 2025

Uh oh!

nagilson commented Nov 7, 2025

Uh oh!

github-actions bot commented Nov 7, 2025

Uh oh!

github-actions bot commented Nov 7, 2025

Uh oh!

github-actions bot commented Nov 7, 2025

Uh oh!

github-actions bot commented Nov 7, 2025

Uh oh!

Uh oh!

Uh oh!

nagilson commented Nov 7, 2025

Uh oh!

github-actions bot commented Nov 7, 2025

Uh oh!

nagilson commented Nov 7, 2025

Uh oh!

nagilson commented Nov 7, 2025

Uh oh!

nagilson commented Nov 7, 2025

Uh oh!

github-actions bot commented Nov 7, 2025

Uh oh!

nagilson commented Nov 7, 2025

Uh oh!

github-actions bot commented Nov 7, 2025

Uh oh!

github-actions bot commented Nov 7, 2025

Uh oh!

github-actions bot commented Nov 7, 2025

Uh oh!

github-actions bot commented Nov 7, 2025

Uh oh!

github-actions bot commented Nov 7, 2025

Uh oh!

nagilson commented Nov 7, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Fix `vs2022` Image rejecting preview sdks, failing to resolve sdks #51558

Fix `vs2022` Image rejecting preview sdks, failing to resolve sdks #51558

nagilson commented Nov 4, 2025 •

edited

Loading