Repository navigation
Description
Tip
Your pull request is ready to create! 🎉 ✅
Everything is OK—the changes have been pushed to branch code-simplifier/dotnet-muxer-locator-windows-83752ea2bd4cd556. Please review the changes, including any protected files, before creating the pull request.
The original pull request description is below.
Code Simplification - 2026-09-28
Simplifies GetMuxerArchitectureByPEHeaderOnWin in DotnetMuxerLocator.Windows.cs, which was recently split out from DotnetMuxerLocator.cs in #11534.
Files Simplified
src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/DotnetMuxerLocator.Windows.cs— Replaced thevalidImageboolean flag with nestedifblocks in favor of early returns, and replaced theswitchstatement mapping PE machine codes toPlatformArchitecturewith aswitchexpression.
Improvements Made
-
Reduced Complexity
- Removed the mutable
validImageflag and its three levels of nestedif (validImage) { ... }blocks; each invalid-image condition now returns immediately via a localThrowInvalidImage()helper, matching the original exception message and behavior.
- Removed the mutable
-
Enhanced Clarity
- Converted the
switchstatement assigningarchTypeto aswitchexpression, consistent with the project's guidance to prefer pattern matching and switch expressions. - Logic now reads top-to-bottom without needing to track flag state across the method body.
- Converted the
-
Preserved Behavior
- The method throws the same
InvalidOperationException(with an identical message) in all the same invalid-header cases (invalid offset, missing PE signature, invalid magic number, unrecognized machine code). - Successful resolution still returns the correct
PlatformArchitecturefor X86, X64/IA64, ARM64, and ARM/Thumb/ARMNT machine codes.
- The method throws the same
Testing
- ✅ Built
Microsoft.Testing.Platform.MSBuild.csproj— succeeded with 0 warnings/errors. - ✅ Ran
Microsoft.Testing.Platform.MSBuild.UnitTests— 132 passed, 1 skipped (Windows/macOS-only architecture-validation test, expected to skip on Linux), 0 failed. - ✅ No functional changes — behavior is identical.
Review Focus
Please verify:
- The early-return refactor preserves the exact original control flow and exception message.
- No unintended side effects from converting the switch statement to a switch expression.
Note
GitHub Actions is not permitted to create or approve pull requests in this repository.
The changes have been pushed to branch
code-simplifier/dotnet-muxer-locator-windows-83752ea2bd4cd556and are ready to review.
To fix the permissions issue, go to Settings → Actions → General and enable Allow GitHub Actions to create and approve pull requests. See also: gh-aw FAQ
Show patch preview (39 of 156 lines)
From 1e794f80e320d5ba4921707531e71a4b93f9e490 Mon Sep 17 00:00:00 2001
X-GH-AW-Base-Commit: eb52efa0bf8974f3cfb8ef446dc396174fe4efe1
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Mon, 28 Sep 2026 13:34:06 +0000
Subject: [PATCH] Simplify GetMuxerArchitectureByPEHeaderOnWin with early
returns
Replace the validImage boolean flag and nested if-blocks with early
returns (via a local ThrowInvalidImage helper) and replace the
switch statement mapping machine codes to PlatformArchitecture with
a switch expression. Behavior is unchanged: the method still throws
InvalidOperationException whenever the PE header cannot be
determined to be a recognized architecture.
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
---
.../Tasks/DotnetMuxerLocator.Windows.cs | 98 +++++++------------
1 file changed, 37 insertions(+), 61 deletions(-)
diff --git a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/DotnetMuxerLocator.Windows.cs b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/DotnetMuxerLocator.Windows.cs
index 442a7c8..e6b6e0f 100644
--- a/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/DotnetMuxerLocator.Windows.cs
+++ b/src/Platform/Microsoft.Testing.Platform.MSBuild/Tasks/DotnetMuxerLocator.Windows.cs
@@ -10,10 +10,6 @@ internal sealed partial class DotnetMuxerLocator
{
// For details refer to below code available on MSDN.
// https://code.msdn.microsoft.com/windowsapps/CSCheckExeType-aab06100#content
- PlatformArchitecture? archType = null;
- ushort machine = 0;
-
- uint peHeader;
const int imageFileMachineAmd64 = 0x8664;
const int imageFileMachineIa64 = 0x200;
const int imageFileMachineI386 = 0x14c;
@@ -22,80 +18,60 @@ internal sealed partial class DotnetMuxerLocator
const int imageFileMachineArmnt = 0x01c4; // ARM Thumb-2 Little-Endian
const int imageFileMachineArm64 = 0xAA64;
+ PlatformArchitecture?
... (truncated)Warning
Firewall blocked 75 domains
The following domains were blocked by the firewall during workflow execution:
0t3vsblobprodcus362.vsblob.vsassets.io11vvsblobprodcus336.vsblob.vsassets.io1k9vsblobprodcus379.vsblob.vsassets.io1s1vsblobprodcus386.vsblob.vsassets.io37bvsblobprodcus311.vsblob.vsassets.io37cvsblobprodcus359.vsblob.vsassets.io4m6vsblobprodcus384.vsblob.vsassets.io4vyvsblobprodcus361.vsblob.vsassets.io4zjvsblobprodcus390.vsblob.vsassets.io51yvsblobprodcus36.vsblob.vsassets.io5dkvsblobprodcus355.vsblob.vsassets.io5rqvsblobprodcus385.vsblob.vsassets.io6s7vsblobprodcus313.vsblob.vsassets.io7k6vsblobprodcus337.vsblob.vsassets.io7tjvsblobprodcus341.vsblob.vsassets.io80zvsblobprodcus35.vsblob.vsassets.io8xbvsblobprodcus382.vsblob.vsassets.io96bvsblobprodcus338.vsblob.vsassets.ioajhvsblobprodcus363.vsblob.vsassets.iobcnvsblobprodcus378.vsblob.vsassets.iobuilds.dotnet.microsoft.comc78vsblobprodcus322.vsblob.vsassets.iocflvsblobprodcus383.vsblob.vsassets.ioci.dot.netckzvsblobprodcus347.vsblob.vsassets.iod0svsblobprodcus381.vsblob.vsassets.iodata.nuget.orgdlbvsblobprodcus316.vsblob.vsassets.ioe7bvsblobprodcus348.vsblob.vsassets.iofdpvsblobprodcus345.vsblob.vsassets.iofrdvsblobprodcus327.vsblob.vsassets.iogbsvsblobprodcus365.vsblob.vsassets.ioh6tvsblobprodcus346.vsblob.vsassets.ioi1qvsblobprodcus353.vsblob.vsassets.iojd4vsblobprodcus366.vsblob.vsassets.iojosvsblobprodcus372.vsblob.vsassets.iojrqvsblobprodcus343.vsblob.vsassets.iok0ivsblobprodcus356.vsblob.vsassets.iok4kvsblobprodcus344.vsblob.vsassets.iokgfvsblobprodcus314.vsblob.vsassets.iokijvsblobprodcus387.vsblob.vsassets.iokxqvsblobprodcus376.vsblob.vsassets.iol49vsblobprodcus358.vsblob.vsassets.iol7avsblobprodcus319.vsblob.vsassets.ioljcvsblobprodcus317.vsblob.vsassets.iolylvsblobprodcus31.vsblob.vsassets.iom16vsblobprodcus374.vsblob.vsassets.iom6xvsblobprodcus342.vsblob.vsassets.iomfjvsblobprodcus373.vsblob.vsassets.ion3kvsblobprodcus335.vsblob.vsassets.ioo3svsblobprodcus318.vsblob.vsassets.ioofvvsblobprodcus315.vsblob.vsassets.iop2ovsblobprodcus312.vsblob.vsassets.iopc2vsblobprodcus360.vsblob.vsassets.iopdfvsblobprodcus380.vsblob.vsassets.iope3vsblobprodcus354.vsblob.vsassets.iopkgs.dev.azure.comrcxvsblobprodcus328.vsblob.vsassets.ios8mvsblobprodcus38.vsblob.vsassets.iose1vsblobprodcus349.vsblob.vsassets.iosouthcentralus0.in.applicationinsights.azure.comsqdvsblobprodcus333.vsblob.vsassets.iost8vsblobprodcus339.vsblob.vsassets.iotphvsblobprodcus375.vsblob.vsassets.iou3hvsblobprodcus371.vsblob.vsassets.iou6ovsblobprodcus377.vsblob.vsassets.ioukkvsblobprodcus352.vsblob.vsassets.iouy6vsblobprodcus34.vsblob.vsassets.iov53vsblobprodcus320.vsblob.vsassets.iovb4vsblobprodcus33.vsblob.vsassets.iovwvvsblobprodcus334.vsblob.vsassets.iox3yvsblobprodcus370.vsblob.vsassets.ioxupvsblobprodcus332.vsblob.vsassets.ioyluvsblobprodcus367.vsblob.vsassets.ioyttvsblobprodcus357.vsblob.vsassets.io
To allow these domains, add them to the network.allowed list in your workflow frontmatter:
network:
allowed:
- defaults
- "0t3vsblobprodcus362.vsblob.vsassets.io"
- "11vvsblobprodcus336.vsblob.vsassets.io"
- "1k9vsblobprodcus379.vsblob.vsassets.io"
- "1s1vsblobprodcus386.vsblob.vsassets.io"
- "37bvsblobprodcus311.vsblob.vsassets.io"
- "37cvsblobprodcus359.vsblob.vsassets.io"
- "4m6vsblobprodcus384.vsblob.vsassets.io"
- "4vyvsblobprodcus361.vsblob.vsassets.io"
- "4zjvsblobprodcus390.vsblob.vsassets.io"
- "51yvsblobprodcus36.vsblob.vsassets.io"
- "5dkvsblobprodcus355.vsblob.vsassets.io"
- "5rqvsblobprodcus385.vsblob.vsassets.io"
- "6s7vsblobprodcus313.vsblob.vsassets.io"
- "7k6vsblobprodcus337.vsblob.vsassets.io"
- "7tjvsblobprodcus341.vsblob.vsassets.io"
- "80zvsblobprodcus35.vsblob.vsassets.io"
- "8xbvsblobprodcus382.vsblob.vsassets.io"
- "96bvsblobprodcus338.vsblob.vsassets.io"
- "ajhvsblobprodcus363.vsblob.vsassets.io"
- "bcnvsblobprodcus378.vsblob.vsassets.io"
- "builds.dotnet.microsoft.com"
- "c78vsblobprodcus322.vsblob.vsassets.io"
- "cflvsblobprodcus383.vsblob.vsassets.io"
- "ci.dot.net"
- "ckzvsblobprodcus347.vsblob.vsassets.io"
- "d0svsblobprodcus381.vsblob.vsassets.io"
- "data.nuget.org"
- "dlbvsblobprodcus316.vsblob.vsassets.io"
- "e7bvsblobprodcus348.vsblob.vsassets.io"
- "fdpvsblobprodcus345.vsblob.vsassets.io"
- "frdvsblobprodcus327.vsblob.vsassets.io"
- "gbsvsblobprodcus365.vsblob.vsassets.io"
- "h6tvsblobprodcus346.vsblob.vsassets.io"
- "i1qvsblobprodcus353.vsblob.vsassets.io"
- "jd4vsblobprodcus366.vsblob.vsassets.io"
- "josvsblobprodcus372.vsblob.vsassets.io"
- "jrqvsblobprodcus343.vsblob.vsassets.io"
- "k0ivsblobprodcus356.vsblob.vsassets.io"
- "k4kvsblobprodcus344.vsblob.vsassets.io"
- "kgfvsblobprodcus314.vsblob.vsassets.io"
- "kijvsblobprodcus387.vsblob.vsassets.io"
- "kxqvsblobprodcus376.vsblob.vsassets.io"
- "l49vsblobprodcus358.vsblob.vsassets.io"
- "l7avsblobprodcus319.vsblob.vsassets.io"
- "ljcvsblobprodcus317.vsblob.vsassets.io"
- "lylvsblobprodcus31.vsblob.vsassets.io"
- "m16vsblobprodcus374.vsblob.vsassets.io"
- "m6xvsblobprodcus342.vsblob.vsassets.io"
- "mfjvsblobprodcus373.vsblob.vsassets.io"
- "n3kvsblobprodcus335.vsblob.vsassets.io"
- "o3svsblobprodcus318.vsblob.vsassets.io"
- "ofvvsblobprodcus315.vsblob.vsassets.io"
- "p2ovsblobprodcus312.vsblob.vsassets.io"
- "pc2vsblobprodcus360.vsblob.vsassets.io"
- "pdfvsblobprodcus380.vsblob.vsassets.io"
- "pe3vsblobprodcus354.vsblob.vsassets.io"
- "pkgs.dev.azure.com"
- "rcxvsblobprodcus328.vsblob.vsassets.io"
- "s8mvsblobprodcus38.vsblob.vsassets.io"
- "se1vsblobprodcus349.vsblob.vsassets.io"
- "southcentralus0.in.applicationinsights.azure.com"
- "sqdvsblobprodcus333.vsblob.vsassets.io"
- "st8vsblobprodcus339.vsblob.vsassets.io"
- "tphvsblobprodcus375.vsblob.vsassets.io"
- "u3hvsblobprodcus371.vsblob.vsassets.io"
- "u6ovsblobprodcus377.vsblob.vsassets.io"
- "ukkvsblobprodcus352.vsblob.vsassets.io"
- "uy6vsblobprodcus34.vsblob.vsassets.io"
- "v53vsblobprodcus320.vsblob.vsassets.io"
- "vb4vsblobprodcus33.vsblob.vsassets.io"
- "vwvvsblobprodcus334.vsblob.vsassets.io"
- "x3yvsblobprodcus370.vsblob.vsassets.io"
- "xupvsblobprodcus332.vsblob.vsassets.io"
- "yluvsblobprodcus367.vsblob.vsassets.io"
- "yttvsblobprodcus357.vsblob.vsassets.io"See Network Configuration for more information.
🤖 Automated content by GitHub Copilot. Generated by the Code Simplifier workflow. · copilot · auto · 117.7 AIC · ⌖ 11.7 AIC · ⊞ 14.5K · [◷]( · ◷)
Add this agentic workflow to your repo
To install this agentic workflow, run
gh aw add githubnext/agentics/workflows/code-simplifier.md@main
- expires on Sep 29, 2026, 1:36 PM UTC
Activity