From 9da791d79c7a55d74739f5e225ecd863fe7ad6af Mon Sep 17 00:00:00 2001
From: Kirill Ovchinnikov <kovchinnikov@microsoft.com>
Date: Tue, 24 Feb 2026 18:29:28 +0100
Subject: [PATCH 1/2] Add "BuildingInsideVisualStudioCode" option

---
 dotnet/targets/Xamarin.Shared.Sdk.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.props b/dotnet/targets/Xamarin.Shared.Sdk.props
index 3559642265c8..4a89593124c0 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.props
+++ b/dotnet/targets/Xamarin.Shared.Sdk.props
@@ -15,8 +15,8 @@
 		<_MobilePropsPath>$(_MobilePropsDir)$(MSBuildProjectName).mobile.props</_MobilePropsPath>
 	</PropertyGroup>
 
-	<!-- Imports the .mobile.props file if exists and the build is from VS -->
-	<Import Project="$(_MobilePropsPath)" Condition="Exists('$(_MobilePropsPath)') And '$(BuildingInsideVisualStudio)' == 'true'" />
+	<!-- Imports the .mobile.props file if exists and the build is from VS/VSCode -->
+	<Import Project="$(_MobilePropsPath)" Condition="Exists('$(_MobilePropsPath)') And ('$(BuildingInsideVisualStudio)' == 'true' Or '$(BuildingInsideVisualStudioCode)' == 'true')" />
 	
 	<PropertyGroup>
 		<!-- Set to true when using the Microsoft.<platform>.Sdk NuGet. This is used by pre-existing/shared targets to tweak behavior depending on build system -->

From 625dd60fd427ffa9f7dfbac16195705c830971df Mon Sep 17 00:00:00 2001
From: Kirill Ovchinnikov <kovchinnikov@microsoft.com>
Date: Fri, 27 Feb 2026 18:29:15 +0100
Subject: [PATCH 2/2] Use DesignTimeBuild parameter instead of introducing a
 new one

---
 dotnet/targets/Xamarin.Shared.Sdk.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.props b/dotnet/targets/Xamarin.Shared.Sdk.props
index 4a89593124c0..34a4351bd1f8 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.props
+++ b/dotnet/targets/Xamarin.Shared.Sdk.props
@@ -16,7 +16,7 @@
 	</PropertyGroup>
 
 	<!-- Imports the .mobile.props file if exists and the build is from VS/VSCode -->
-	<Import Project="$(_MobilePropsPath)" Condition="Exists('$(_MobilePropsPath)') And ('$(BuildingInsideVisualStudio)' == 'true' Or '$(BuildingInsideVisualStudioCode)' == 'true')" />
+	<Import Project="$(_MobilePropsPath)" Condition="Exists('$(_MobilePropsPath)') And ('$(BuildingInsideVisualStudio)' == 'true' Or '$(DesignTimeBuild)' == 'true')" />
 	
 	<PropertyGroup>
 		<!-- Set to true when using the Microsoft.<platform>.Sdk NuGet. This is used by pre-existing/shared targets to tweak behavior depending on build system -->