Skip to content

Commit 68de872

Browse files
committed
[msbuild] Fix building apps with extensions remotely.
Pending: the actual fix. For now this only has a test. Fixes https://devdiv.visualstudio.com/DevDiv/_workitems/edit/2542958.
1 parent cc242d2 commit 68de872

File tree

1 file changed

+14
-1
lines changed

1 file changed

+14
-1
lines changed

tests/dotnet/UnitTests/ProjectTest.cs

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1811,6 +1811,19 @@ public void KillEverything ()
18111811
[TestCase (ApplePlatform.MacOSX, "osx-x64;osx-arm64", true)]
18121812
// [TestCase ("MacCatalyst", "")] - No extension support yet
18131813
public void BuildProjectsWithExtensions (ApplePlatform platform, string runtimeIdentifier, bool isNativeAot)
1814+
{
1815+
BuildProjectsWithExtensionsImpl (platform, runtimeIdentifier, isNativeAot);
1816+
}
1817+
1818+
[TestCase (ApplePlatform.iOS, "ios-arm64", false)]
1819+
[Category ("RemoteWindows")]
1820+
public void BuildProjectsWithExtensionsOnRemoteWindows (ApplePlatform platform, string runtimeIdentifier, bool isNativeAot)
1821+
{
1822+
Configuration.IgnoreIfNotOnWindows ();
1823+
BuildProjectsWithExtensionsImpl (platform, runtimeIdentifier, isNativeAot, AddRemoteProperties ());
1824+
}
1825+
1826+
void BuildProjectsWithExtensionsImpl (ApplePlatform platform, string runtimeIdentifier, bool isNativeAot, Dictionary<string, string>? properties = null)
18141827
{
18151828
Configuration.IgnoreIfIgnoredPlatform (platform);
18161829
var consumingProjectDir = GetProjectPath ("ExtensionConsumer", runtimeIdentifier, platform, out var appPath);
@@ -1819,7 +1832,7 @@ public void BuildProjectsWithExtensions (ApplePlatform platform, string runtimeI
18191832
Clean (extensionProjectDir);
18201833
Clean (consumingProjectDir);
18211834

1822-
var properties = GetDefaultProperties (runtimeIdentifier);
1835+
properties = GetDefaultProperties (runtimeIdentifier, extraProperties: properties);
18231836

18241837
if (isNativeAot) {
18251838
properties ["PublishAot"] = "true";

0 commit comments

Comments
 (0)