From 744408a2e11131193d432a78513dcce63f5cd9bd Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Thu, 30 Jul 2026 07:55:28 +0000
Subject: [PATCH 1/3] Update MSBuild to 18.7.1

---
 Directory.Packages.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index fe3e08e6..3fc0b70b 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -18,8 +18,8 @@
     <PackageVersion Include="MessagePack" Version="2.2.85" />
     <PackageVersion Include="MessagePackAnalyzer" Version="2.5.192" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="10.0.9" />
-    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.4.0" />
-    <PackageVersion Include="Microsoft.Build.Framework" Version="18.4.0" />
+    <PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.7.1" />
+    <PackageVersion Include="Microsoft.Build.Framework" Version="18.7.1" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="$(CodeAnalysisVersion)" />
     <PackageVersion Include="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="5.6.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="$(CodeAnalysisVersion)" />

From 0c86bed49b51f2d17d84e177babf7edd82add701 Mon Sep 17 00:00:00 2001
From: Jevan Saks <jevansa@microsoft.com>
Date: Wed, 5 Aug 2026 16:44:47 -0700
Subject: [PATCH 2/3] Keep build tasks off analyzer dependency floor

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: f2a170f0-b67d-4f53-be90-32c7136fe547
---
 Directory.Packages.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 3fc0b70b..d88710bf 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -43,7 +43,7 @@
     <PackageVersion Include="Xunit.Combinatorial" Version="2.0.24" />
     <PackageVersion Include="Xunit.Assert" Version="2.9.3" />
   </ItemGroup>
-  <Import Project="Directory.Packages.Analyzers.props" Condition="'$(IsTestProject)'!='true' and '$(MSBuildProjectName)'!='CsWin32Generator'" />
+  <Import Project="Directory.Packages.Analyzers.props" Condition="'$(IsTestProject)'!='true' and '$(MSBuildProjectName)'!='CsWin32Generator' and '$(MSBuildProjectName)'!='Microsoft.Windows.CsWin32.BuildTasks'" />
   <ItemGroup Label="Library.Template">
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
     <PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />

From 8e68e3dda5cb2d4ef8a35d96fe603771ae0c2885 Mon Sep 17 00:00:00 2001
From: Jevan Saks <jevansa@microsoft.com>
Date: Wed, 5 Aug 2026 22:09:42 -0700
Subject: [PATCH 3/3] Preserve build task compatibility pins

Keep the analyzer dependency floor applied to the build task while privately resolving the System.Memory minimum required by Microsoft.Build.Utilities.Core 18.7.1.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: f2a170f0-b67d-4f53-be90-32c7136fe547
---
 Directory.Packages.props                                        | 2 +-
 .../Microsoft.Windows.CsWin32.BuildTasks.csproj                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index d88710bf..3fc0b70b 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -43,7 +43,7 @@
     <PackageVersion Include="Xunit.Combinatorial" Version="2.0.24" />
     <PackageVersion Include="Xunit.Assert" Version="2.9.3" />
   </ItemGroup>
-  <Import Project="Directory.Packages.Analyzers.props" Condition="'$(IsTestProject)'!='true' and '$(MSBuildProjectName)'!='CsWin32Generator' and '$(MSBuildProjectName)'!='Microsoft.Windows.CsWin32.BuildTasks'" />
+  <Import Project="Directory.Packages.Analyzers.props" Condition="'$(IsTestProject)'!='true' and '$(MSBuildProjectName)'!='CsWin32Generator'" />
   <ItemGroup Label="Library.Template">
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.8.1" />
     <PackageVersion Include="Microsoft.VisualStudio.Internal.MicroBuild.NonShipping" Version="$(MicroBuildVersion)" />
diff --git a/src/Microsoft.Windows.CsWin32.BuildTasks/Microsoft.Windows.CsWin32.BuildTasks.csproj b/src/Microsoft.Windows.CsWin32.BuildTasks/Microsoft.Windows.CsWin32.BuildTasks.csproj
index 97ed75fc..088976b1 100644
--- a/src/Microsoft.Windows.CsWin32.BuildTasks/Microsoft.Windows.CsWin32.BuildTasks.csproj
+++ b/src/Microsoft.Windows.CsWin32.BuildTasks/Microsoft.Windows.CsWin32.BuildTasks.csproj
@@ -7,6 +7,8 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Build.Utilities.Core" PrivateAssets="all" />
+    <!-- Required by Microsoft.Build.Utilities.Core for restore, but not shipped with the build task. -->
+    <PackageReference Include="System.Memory" VersionOverride="4.6.3" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>