Skip to content

[main] Source code updates from dotnet/dotnet#17057

Open
dotnet-maestro[bot] wants to merge 2 commits into
mainfrom
darc-main-10490dc9-62d5-4cac-b54b-c78376a45147
Open

[main] Source code updates from dotnet/dotnet#17057
dotnet-maestro[bot] wants to merge 2 commits into
mainfrom
darc-main-10490dc9-62d5-4cac-b54b-c78376a45147

Conversation

@dotnet-maestro

Copy link
Copy Markdown
Contributor

Note

This is a codeflow update. It may contain both source code changes from
the VMR
as well as dependency updates. Learn more here.

This pull request brings the following source code changes

From https://github.com/dotnet/dotnet

Associated changes in source repos

Diff the source with this PR branch
darc vmr diff --name-only https://github.com/dotnet/dotnet:1358fe9202089df7bdb79282a191c9dbbb773a06..https://github.com/dotnet/arcade:darc-main-10490dc9-62d5-4cac-b54b-c78376a45147

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Note

VMR PRs included in this codeflow update:

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running:
    darc trigger-subscriptions --id b472297a-0d16-41ea-91af-ee5ed4325178
    
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted.
    darc trigger-subscriptions --id b472297a-0d16-41ea-91af-ee5ed4325178 --force
    

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

2 similar comments
@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running:
    darc trigger-subscriptions --id b472297a-0d16-41ea-91af-ee5ed4325178
    
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted.
    darc trigger-subscriptions --id b472297a-0d16-41ea-91af-ee5ed4325178 --force
    

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@dotnet-maestro

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running:
    darc trigger-subscriptions --id b472297a-0d16-41ea-91af-ee5ed4325178
    
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted.
    darc trigger-subscriptions --id b472297a-0d16-41ea-91af-ee5ed4325178 --force
    

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@am11

am11 commented Jun 30, 2026

Copy link
Copy Markdown
Member

All failures are related to vswhere.exe

System.TypeInitializationException : The type initializer for 'Microsoft.DotNet.Build.Tasks.Workloads.Tests.TestBase' threw an exception.\r\n---- System.Exception : vswhere.exe not found. Visual Studio is required to build the test project.

@mmitche, is this a known infra issue? Would be nice to get this in before arcade->VMR flow (to avoid overwriting eng/common changes made in VMR the PR carries)

@am11

am11 commented Jun 30, 2026

Copy link
Copy Markdown
Member

FWIW, nativeaot package uses this standalone mechanism https://github.com/dotnet/runtime/blob/999ca22160f03e33dd970c93373dde5ad7fd1158/src/coreclr/nativeaot/BuildIntegration/Microsoft.NETCore.Native.Windows.targets#L132-L159 it works with .NET engineering infra (those 10-15 components using PublishAot during VMR build across 4 repos..) as well as for Windows users out in the wild. So I think convergence with that infra would make sense.

@mmitche

mmitche commented Jun 30, 2026

Copy link
Copy Markdown
Member

All failures are related to vswhere.exe

System.TypeInitializationException : The type initializer for 'Microsoft.DotNet.Build.Tasks.Workloads.Tests.TestBase' threw an exception.\r\n---- System.Exception : vswhere.exe not found. Visual Studio is required to build the test project.

@mmitche, is this a known infra issue? Would be nice to get this in before arcade->VMR flow (to avoid overwriting eng/common changes made in VMR the PR carries)

Unlikely to be an infra issue and more likely to be some intersection between VS and the SDK.

@mmitche

mmitche commented Jun 30, 2026

Copy link
Copy Markdown
Member

Looking further, it looks like these are tests that @joeloff added. They proibably wont' work in Helix due to not having VS. Should we exclude them from PR runs?

@dotnet-maestro

dotnet-maestro Bot commented Jul 1, 2026

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running:
    darc trigger-subscriptions --id b472297a-0d16-41ea-91af-ee5ed4325178
    
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted.
    darc trigger-subscriptions --id b472297a-0d16-41ea-91af-ee5ed4325178 --force
    

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

1 similar comment
@dotnet-maestro

dotnet-maestro Bot commented Jul 2, 2026

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running:
    darc trigger-subscriptions --id b472297a-0d16-41ea-91af-ee5ed4325178
    
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted.
    darc trigger-subscriptions --id b472297a-0d16-41ea-91af-ee5ed4325178 --force
    

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

@ViktorHofer

Copy link
Copy Markdown
Member

@joeloff PTAL

@dotnet-maestro

dotnet-maestro Bot commented Jul 3, 2026

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running:
    darc trigger-subscriptions --id b472297a-0d16-41ea-91af-ee5ed4325178
    
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted.
    darc trigger-subscriptions --id b472297a-0d16-41ea-91af-ee5ed4325178 --force
    

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.


if (!File.Exists(vswhere))
{
throw new Exception("vswhere.exe not found. Visual Studio is required to build the test project.");

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

The way runtime handles NativeAOT tests is by relying on the publish test artifacts step which runs before Send to Helix step. If something went wrong during the publishing, CI fails all the same and we can see the result. The tests only run on Helix.

I think we should do the same here. For now, lets just skip it:

Suggested change
throw new Exception("vswhere.exe not found. Visual Studio is required to build the test project.");
Assert.Skip("Skipping because vswhere.exe is unavailable on this machine.");

@dotnet-maestro

dotnet-maestro Bot commented Jul 4, 2026

Copy link
Copy Markdown
Contributor Author

Important

While this PR was open, the source repository has received code changes from this repository (an opposite codeflow merged).
To avoid complex conflicts, the codeflow cannot continue until this PR is closed or merged.

You can continue with one of the following options:

  • Ignore this and merge this PR as usual without waiting for the new changes.
    Once merged, Maestro will create a new codeflow PR with the new changes.
  • Close this PR and wait for Maestro to open a new one with old and new changes included.
    You will lose any manual changes made in this PR.
    You can also manually trigger the new codeflow right away by running:
    darc trigger-subscriptions --id b472297a-0d16-41ea-91af-ee5ed4325178
    
  • Force a codeflow into this PR at your own risk if you want the new changes.
    User commits made to this PR might be reverted.
    darc trigger-subscriptions --id b472297a-0d16-41ea-91af-ee5ed4325178 --force
    

💡 You may consult the FAQ for more information or tag @dotnet/prodconsvcs for assistance.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants