From 91b20fe3e8ad87955397388a3107760def73da02 Mon Sep 17 00:00:00 2001
From: Loi Nguyen <vanloi999@gmail.com>
Date: Fri, 31 Jul 2026 02:12:35 +0700
Subject: [PATCH 1/2] Avoid reading Configuration in Directory.Build.props

---
 Directory.Build.props       | 11 -----------
 Directory.Build.targets     |  8 ++++++++
 global.json                 |  2 +-
 src/Directory.Build.targets |  2 ++
 4 files changed, 11 insertions(+), 12 deletions(-)
 create mode 100644 Directory.Build.targets

diff --git a/Directory.Build.props b/Directory.Build.props
index f5cdd3aad..8bf83547e 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -11,30 +11,19 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <!-- This works around issues with dotnet test which are fixed in https://github.com/dotnet/sdk/pull/51794 -->
-    <!-- It can be safely removed once .NET SDK 10.0.101 is out and is used in the repo -->
-    <Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
-
     <RepoRoot>$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)'))</RepoRoot>
     <ArtifactsDir Condition="'$(ArtifactsDir)' == ''">$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'artifacts'))</ArtifactsDir>
     <ArtifactsObjDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'obj'))</ArtifactsObjDir>
     <ArtifactsBinDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'bin'))</ArtifactsBinDir>
-    <ArtifactsTestResultsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'TestResults', '$(Configuration)'))</ArtifactsTestResultsDir>
-    <ArtifactsPackagesDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'packages', '$(Configuration)'))</ArtifactsPackagesDir>
     <OutDirName>$(MSBuildProjectName)</OutDirName>
 
     <BaseIntermediateOutputPath>$([System.IO.Path]::GetFullPath('$(ArtifactsObjDir)$(OutDirName)\'))</BaseIntermediateOutputPath>
-    <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
 
     <BaseOutputPath>$([System.IO.Path]::GetFullPath('$(ArtifactsBinDir)$(OutDirName)\'))</BaseOutputPath>
-    <OutputPath>$(BaseOutputPath)$(Configuration)\</OutputPath>
-
-    <PackageOutputPath>$(ArtifactsPackagesDir)</PackageOutputPath>
   </PropertyGroup>
 
   <PropertyGroup>
     <VSTestLogger Condition="'$(VSTestLogger)' == ''">trx%3bLogFileName=$(MSBuildProjectName).$(TargetFramework).$(OS).trx</VSTestLogger>
-    <VSTestResultsDirectory Condition="'$(VSTestResultsDirectory)' == ''">$(ArtifactsTestResultsDir)</VSTestResultsDirectory>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(GITHUB_ACTIONS)' == 'true'">
diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 000000000..d545f8be6
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,8 @@
+<Project>
+  <PropertyGroup>
+    <ArtifactsTestResultsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'TestResults', '$(Configuration)'))</ArtifactsTestResultsDir>
+    <ArtifactsPackagesDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'packages', '$(Configuration)'))</ArtifactsPackagesDir>
+    <PackageOutputPath>$(ArtifactsPackagesDir)</PackageOutputPath>
+    <VSTestResultsDirectory Condition="'$(VSTestResultsDirectory)' == ''">$(ArtifactsTestResultsDir)</VSTestResultsDirectory>
+  </PropertyGroup>
+</Project>
diff --git a/global.json b/global.json
index fcb4599c2..9e13a6187 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "10.0.100",
+    "version": "10.0.101",
     "rollForward": "minor"
   }
 }
diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index ee635a551..0c3c50923 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -1,4 +1,6 @@
 <Project>
+  <Import Project="..\Directory.Build.targets" />
+
   <Target Name="PinMcpProjectReferencePackageVersions"
           AfterTargets="_GetProjectReferenceVersions"
           Condition="'$(MSBuildProjectName)' == 'ModelContextProtocol'

From 18e675d6865c8b3f4095aefbfc60836abfd919df Mon Sep 17 00:00:00 2001
From: Loi Nguyen <vanloi999@gmail.com>
Date: Fri, 31 Jul 2026 02:33:49 +0700
Subject: [PATCH 2/2] ci: rerun flaky Windows tests