Skip to content

[msbuild/dotnet] Fix remote Release builds when using plural RuntimeIdentifiers. Fixes #24046. #24228

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+8 −6
Draft

[msbuild/dotnet] Fix remote Release builds when using plural RuntimeIdentifiers. Fixes #24046. #24228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions tests/dotnet/UnitTests/ProjectTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2225,15 +2225,16 @@ public void PluralRuntimeIdentifiers (ApplePlatform platform, string runtimeIden
PluralRuntimeIdentifiersImpl (platform, runtimeIdentifiers);
}

internal static void PluralRuntimeIdentifiersImpl (ApplePlatform platform, string runtimeIdentifiers, Dictionary<string, string>? extraProperties = null)
internal static void PluralRuntimeIdentifiersImpl (ApplePlatform platform, string runtimeIdentifiers, Dictionary<string, string>? extraProperties = null, string configuration = "Debug")
{
var project = "MySimpleApp";
Configuration.IgnoreIfIgnoredPlatform (platform);
Configuration.AssertRuntimeIdentifiersAvailable (platform, runtimeIdentifiers);

var project_path = GetProjectPath (project, runtimeIdentifiers: runtimeIdentifiers, platform: platform, out var appPath);
var project_path = GetProjectPath (project, runtimeIdentifiers: runtimeIdentifiers, platform: platform, out var appPath, configuration: configuration);
Clean (project_path);
var properties = GetDefaultProperties (extraProperties: extraProperties);
properties ["Configuration"] = configuration;
properties ["RuntimeIdentifiers"] = runtimeIdentifiers;

DotNet.AssertBuild (project_path, properties);
Expand Down
9 changes: 5 additions & 4 deletions tests/dotnet/UnitTests/WindowsTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,12 +213,13 @@ public void BundleStructureWithRemoteMac (ApplePlatform platform, string runtime
}

[Category ("RemoteWindows")]
[TestCase (ApplePlatform.iOS, "ios-arm64")]
[TestCase (ApplePlatform.iOS, "iossimulator-arm64;iossimulator-x64")]
public void PluralRuntimeIdentifiersWithRemoteMac (ApplePlatform platform, string runtimeIdentifiers)
[TestCase (ApplePlatform.iOS, "ios-arm64", "Debug")]
[TestCase (ApplePlatform.iOS, "ios-arm64", "Release")]
[TestCase (ApplePlatform.iOS, "iossimulator-arm64;iossimulator-x64", "Debug")]
public void PluralRuntimeIdentifiersWithRemoteMac (ApplePlatform platform, string runtimeIdentifiers, string configuration)
{
var properties = AddRemoteProperties ();
DotNetProjectTest.PluralRuntimeIdentifiersImpl (platform, runtimeIdentifiers, properties);
DotNetProjectTest.PluralRuntimeIdentifiersImpl (platform, runtimeIdentifiers, properties, configuration);
}

static void AssertWarningsEqual (IList<string> expected, IList<string> actual, string message)
Expand Down
Loading