Skip to content

[msbuild] sanity check TargetiOSDevice property for conflicts (#1799) #1809

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

Merged
jstedfast merged 1 commit into from
Mar 1, 2017
Merged

[msbuild] sanity check TargetiOSDevice property for conflicts (#1799) #1809

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
9 changes: 2 additions & 7 deletions msbuild/Xamarin.iOS.Tasks.Core/Tasks/ParseDeviceSpecificBuildInformationTaskBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,8 @@ public override bool Execute ()
return false;
}

if (os.Value != targetOperatingSystem) {
// user is building the solution for another Apple device, do not build this project for a specific device
if (os.Value != targetOperatingSystem || (architectures & deviceArchitectures) == 0) {
// the TargetiOSDevice property conflicts with the build configuration (*.user file?), do not build this project for a specific device
DeviceSpecificIntermediateOutputPath = IntermediateOutputPath;
DeviceSpecificOutputPath = OutputPath;
TargetArchitectures = Architectures;
Expand All @@ -118,11 +118,6 @@ public override bool Execute ()
return !Log.HasLoggedErrors;
}

if ((architectures & deviceArchitectures) == 0) {
Log.LogError ("The target {0} device architecture {1} is not supported by the build configuration: {2}", targetOperatingSystem, architectures, deviceArchitectures);
return false;
}

for (int bit = 0; bit < 32; bit++) {
var architecture = (TargetArchitecture) (1 << bit);

Expand Down