From d1498bf846fe53bea1fb9523e748db7bc53e6ce0 Mon Sep 17 00:00:00 2001
From: Youssef Victor <youssefvictor00@gmail.com>
Date: Mon, 20 Oct 2025 11:31:47 +0200
Subject: [PATCH 1/2] Update Microsoft.Build.Utilities.Core to 17.11.48

---
 Directory.Packages.props | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index d4fc62a1e4..c215164122 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -12,8 +12,13 @@
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <PropertyGroup Label="Product dependencies">
+<<<<<<< HEAD
     <AspireHostingTestingVersion>9.5.0</AspireHostingTestingVersion>
     <MicrosoftBuildVersion>17.11.4</MicrosoftBuildVersion>
+=======
+    <AspireHostingTestingVersion>9.5.1</AspireHostingTestingVersion>
+    <MicrosoftBuildVersion>17.11.48</MicrosoftBuildVersion>
+>>>>>>> Update Microsoft.Build.Utilities.Core to 17.11.48
     <MicrosoftCodeAnalysisVersion>3.11.0</MicrosoftCodeAnalysisVersion>
     <MicrosoftCodeAnalysisVersionForTests>4.10.0</MicrosoftCodeAnalysisVersionForTests>
     <MicrosoftCodeAnalysisVersionForSourceGen>4.8.0</MicrosoftCodeAnalysisVersionForSourceGen>

From b9dc96e8254f63ac2f4da60ab4957b8564a7c4cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Jare=C5=A1?= <me@jakubjares.com>
Date: Fri, 31 Oct 2025 16:39:10 +0100
Subject: [PATCH 2/2] Apply suggestion from @nohwnd

---
 Directory.Packages.props | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index c215164122..df9963f7ea 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -12,13 +12,8 @@
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <PropertyGroup Label="Product dependencies">
-<<<<<<< HEAD
     <AspireHostingTestingVersion>9.5.0</AspireHostingTestingVersion>
-    <MicrosoftBuildVersion>17.11.4</MicrosoftBuildVersion>
-=======
-    <AspireHostingTestingVersion>9.5.1</AspireHostingTestingVersion>
     <MicrosoftBuildVersion>17.11.48</MicrosoftBuildVersion>
->>>>>>> Update Microsoft.Build.Utilities.Core to 17.11.48
     <MicrosoftCodeAnalysisVersion>3.11.0</MicrosoftCodeAnalysisVersion>
     <MicrosoftCodeAnalysisVersionForTests>4.10.0</MicrosoftCodeAnalysisVersionForTests>
     <MicrosoftCodeAnalysisVersionForSourceGen>4.8.0</MicrosoftCodeAnalysisVersionForSourceGen>