diff --git a/msbuild/Directory.Build.props b/msbuild/Directory.Build.props
index fd00d93b5cd9..b86b828b021c 100644
--- a/msbuild/Directory.Build.props
+++ b/msbuild/Directory.Build.props
@@ -15,7 +15,7 @@
 			https://dev.azure.com/azure-public/vside/_artifacts/feed/xamarin-impl/NuGet/Xamarin.Messaging.Client/
 
 		-->
-		<MessagingVersion Condition="'$(MessagingVersion)' == ''">[18.1.4-g269e166fc3]</MessagingVersion>
+		<MessagingVersion Condition="'$(MessagingVersion)' == ''">[18.1.49-gfb8e1a6a31]</MessagingVersion>
 	</PropertyGroup>
 	<Import Project="$(MSBuildThisFileDirectory)../Directory.Build.props" />
 </Project>
diff --git a/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.Common.targets b/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.Common.targets
index 569a2dbac1d9..7e7fb0796862 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.Common.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Mac.AppExtension.Common.targets
@@ -25,17 +25,6 @@ Copyright (C) 2013-2014 Xamarin. All rights reserved.
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets" 
 			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
-  
-	<!-- Override GetTargetPath, Build, and Rebuild -->
-	<Target Name="GetBundleTargetPath" DependsOnTargets="_GenerateBundleName;$(GetTargetPathDependsOn)" Outputs="@(_AppExtensionBundlePath)" />
-	<Target Name="Build"   Condition="'$(_InvalidConfigurationWarning)' != 'true'" DependsOnTargets="_EnabledLocalSigning;_GenerateBundleName;$(BuildDependsOn)" Outputs="$(_AppExtensionBundlePath)" />
-	<Target Name="Rebuild" Condition="'$(_InvalidConfigurationWarning)' != 'true'" DependsOnTargets="_EnabledLocalSigning;_GenerateBundleName;$(RebuildDependsOn)" Outputs="$(_AppExtensionBundlePath)" />
-
-	<Target Name="_EnabledLocalSigning" DependsOnTargets="_DetectSigningIdentity">
-		<PropertyGroup>
-			<CodesignEntitlements Condition="'$(CodesignEntitlements)' == ''">Entitlements.plist</CodesignEntitlements>
-		</PropertyGroup>
-	</Target>
 
 	<Target Name="CreateIpa"/>
 
diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
index 4ae3be09211d..4b62d70768a6 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
@@ -120,7 +120,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 
 	<Target Name="_DetectBuildType">
 		<PropertyGroup>
-			<IsRemoteBuild Condition="'$(BundleOriginalResources)' == 'true' And '$(OutputType)' != 'Exe' And '$(BuildBindingProjectLocally)' != 'false'">False</IsRemoteBuild>
+			<IsRemoteBuild Condition="'$(BundleOriginalResources)' == 'true' And '$(_CanOutputAppBundle)' != 'true' And '$(BuildBindingProjectLocally)' != 'false'">False</IsRemoteBuild>
 		</PropertyGroup>
 	</Target>
 
@@ -2665,6 +2665,10 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 
 	<!-- App extensions -->
 
+	<Target Name="GetAppExtensionBundlePath" DependsOnTargets="_GenerateBundleName;$(GetTargetPathDependsOn)" Outputs="@(_AppExtensionBundlePath)" />
+
+	<Target Name="BuildAndGetAppExtensionBundlePath" DependsOnTargets="Build" Outputs="@(_AppExtensionBundlePath)" />
+
 	<Target Name="_AssignAppExtensionConfiguration" Condition="'@(_AppExtensionReference)' != ''">
 		<!-- assign configs if building a solution file -->
 		<AssignProjectConfiguration
@@ -2712,10 +2716,10 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 			<_BuildReferencedExtensionProjects Condition="'$(BuildingInsideVisualStudio)' != 'true'">true</_BuildReferencedExtensionProjects>
 		</PropertyGroup>
 
-		<!-- If the referenced projects have already been built, then just get the target paths -->
+		<!-- If the referenced projects have already been built, then just get the app extensions' bundle paths -->
 		<MSBuild
 			Projects="@(_AppExtensionReferenceWithConfigurationExistent)"
-			Targets="GetBundleTargetPath"
+			Targets="GetAppExtensionBundlePath"
 			Properties="%(_AppExtensionReferenceWithConfigurationExistent.SetConfiguration); %(_AppExtensionReferenceWithConfigurationExistent.SetPlatform)"
 			Condition="'@(_AppExtensionReferenceWithConfigurationExistent)' != '' and '$(_BuildReferencedExtensionProjects)' != 'true'">
 
@@ -2725,6 +2729,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 		<!-- Build the referenced project if required -->
 		<MSBuild
 			Projects="@(_AppExtensionReferenceWithConfigurationExistent)"
+			Targets="BuildAndGetAppExtensionBundlePath"
 			Properties="%(_AppExtensionReferenceWithConfigurationExistent.SetConfiguration); %(_AppExtensionReferenceWithConfigurationExistent.SetPlatform)"
 			Condition="'@(_AppExtensionReferenceWithConfigurationExistent)' != '' and '$(_BuildReferencedExtensionProjects)' == 'true' ">
 
diff --git a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.Common.targets b/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.Common.targets
index f2348586feab..78ab53ef731a 100644
--- a/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.Common.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.TVOS.AppExtension.Common.targets
@@ -33,11 +33,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets"
 			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
 
-	<!-- Override GetTargetPath, Build, and Rebuild -->
-	<Target Name="GetBundleTargetPath" DependsOnTargets="_GenerateBundleName;$(GetTargetPathDependsOn)" Outputs="@(_AppExtensionBundlePath)" />
-	<Target Name="Build"   Condition="'$(_InvalidConfigurationWarning)' != 'true'" DependsOnTargets="_GenerateBundleName;$(BuildDependsOn)" Outputs="@(_AppExtensionBundlePath)" />
-	<Target Name="Rebuild" Condition="'$(_InvalidConfigurationWarning)' != 'true'" DependsOnTargets="_GenerateBundleName;$(RebuildDependsOn)" Outputs="@(_AppExtensionBundlePath)" />
-
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
 			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
 
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.Common.targets b/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.Common.targets
index 2c2584b6b595..67cd4bfe4602 100644
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.Common.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.iOS.AppExtension.Common.targets
@@ -26,11 +26,6 @@ Copyright (C) 2014-2016 Xamarin. All rights reserved.
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets" 
 			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
-	
-	<!-- Override GetTargetPath, Build, and Rebuild -->
-	<Target Name="GetBundleTargetPath" DependsOnTargets="_GenerateBundleName;$(GetTargetPathDependsOn)" Outputs="@(_AppExtensionBundlePath)" />
-	<Target Name="Build"   Condition="'$(_InvalidConfigurationWarning)' != 'true'" DependsOnTargets="_GenerateBundleName;$(BuildDependsOn)" Outputs="@(_AppExtensionBundlePath)" />
-	<Target Name="Rebuild" Condition="'$(_InvalidConfigurationWarning)' != 'true'" DependsOnTargets="_GenerateBundleName;$(RebuildDependsOn)" Outputs="@(_AppExtensionBundlePath)" />
 
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
 			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
diff --git a/msbuild/Xamarin.Shared/Xamarin.iOS.Common.targets b/msbuild/Xamarin.Shared/Xamarin.iOS.Common.targets
index e41b93ce7ac5..804a66334bbf 100644
--- a/msbuild/Xamarin.Shared/Xamarin.iOS.Common.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.iOS.Common.targets
@@ -235,7 +235,7 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		<!-- If the referenced projects have already been built, then just get the target paths -->
 		<MSBuild
 			Projects="@(_WatchAppReferenceWithConfigurationExistent)"
-			Targets="GetBundleTargetPath"
+			Targets="GetAppExtensionBundlePath"
 			Properties="%(_WatchAppReferenceWithConfigurationExistent.SetConfiguration); %(_WatchAppReferenceWithConfigurationExistent.SetPlatform)"
 			Condition="'@(_WatchAppReferenceWithConfigurationExistent)' != '' and '$(_BuildReferencedExtensionProjects)' != 'true'">
 
diff --git a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.Messaging.Apple.targets b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.Messaging.Apple.targets
index af7c6b398843..1c4fc93356b4 100644
--- a/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.Messaging.Apple.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Windows/Xamarin.Messaging.Apple.targets
@@ -20,7 +20,7 @@
 	<Target Name="EvaluateRemoteBuild">
 		<PropertyGroup>
 			<IsRemoteBuild>True</IsRemoteBuild>
-			<IsRemoteBuild Condition="'$(BundleOriginalResources)' == 'true' And '$(OutputType)' != 'Exe' And '$(BuildBindingProjectLocally)' != 'false'">False</IsRemoteBuild>
+			<IsRemoteBuild Condition="'$(BundleOriginalResources)' == 'true' And '$(_CanOutputAppBundle)' != 'true' And '$(BuildBindingProjectLocally)' != 'false'">False</IsRemoteBuild>
 		</PropertyGroup>
 	</Target>
 
diff --git a/tests/dotnet/UnitTests/ProjectTest.cs b/tests/dotnet/UnitTests/ProjectTest.cs
index 08e4af770199..5da95bd44850 100644
--- a/tests/dotnet/UnitTests/ProjectTest.cs
+++ b/tests/dotnet/UnitTests/ProjectTest.cs
@@ -1868,6 +1868,19 @@ public void KillEverything ()
 		[TestCase (ApplePlatform.MacOSX, "osx-x64;osx-arm64", true)]
 		// [TestCase ("MacCatalyst", "")] - No extension support yet
 		public void BuildProjectsWithExtensions (ApplePlatform platform, string runtimeIdentifier, bool isNativeAot)
+		{
+			BuildProjectsWithExtensionsImpl (platform, runtimeIdentifier, isNativeAot);
+		}
+
+		[TestCase (ApplePlatform.iOS, "ios-arm64", false)]
+		[Category ("RemoteWindows")]
+		public void BuildProjectsWithExtensionsOnRemoteWindows (ApplePlatform platform, string runtimeIdentifier, bool isNativeAot)
+		{
+			Configuration.IgnoreIfNotOnWindows ();
+			BuildProjectsWithExtensionsImpl (platform, runtimeIdentifier, isNativeAot, AddRemoteProperties ());
+		}
+
+		void BuildProjectsWithExtensionsImpl (ApplePlatform platform, string runtimeIdentifier, bool isNativeAot, Dictionary<string, string>? properties = null)
 		{
 			Configuration.IgnoreIfIgnoredPlatform (platform);
 			var consumingProjectDir = GetProjectPath ("ExtensionConsumer", runtimeIdentifier, platform, out var appPath);
@@ -1876,7 +1889,7 @@ public void BuildProjectsWithExtensions (ApplePlatform platform, string runtimeI
 			Clean (extensionProjectDir);
 			Clean (consumingProjectDir);
 
-			var properties = GetDefaultProperties (runtimeIdentifier);
+			properties = GetDefaultProperties (runtimeIdentifier, extraProperties: properties);
 
 			if (isNativeAot) {
 				properties ["PublishAot"] = "true";