Skip to content
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

[msbuild] Adjust error message when we can't find Xcode to not talk about VS. Fixes #19818. #20306

Merged
merged 1 commit into from
Mar 20, 2024
Merged

[msbuild] Adjust error message when we can't find Xcode to not talk about VS. Fixes #19818. #20306

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
6 changes: 6 additions & 0 deletions msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,12 @@
<comment>The following are literal names and should not be translated: Xcode, Apple SDK, Visual Studio
{0} - The selected Xcode / Apple SDK directory.</comment>
</data>

<data name="E0044v2" xml:space="preserve">
<value>Could not find a valid Xcode app bundle at '{0}'. Please verify that 'xcode-select -p' points to your Xcode installation. For more information see https://aka.ms/macios-missing-xcode.
</value>
<comment>The following are literal names and should not be translated: Xcode</comment>
</data>

<data name="E0045" xml:space="preserve">
<value>Could not find valid a usable Xcode developer path
Expand Down
9 changes: 1 addition & 8 deletions msbuild/Xamarin.MacDev.Tasks/Tasks/DetectSdkLocationCore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,14 +235,7 @@ protected bool EnsureAppleSdkRoot ()
{
var currentSdk = CurrentSdk;
if (!currentSdk.IsInstalled) {
string ideSdkPath;
if (string.IsNullOrEmpty (SessionId))
// SessionId is only and always defined on windows.
// We can't check 'Environment.OSVersion.Platform' since the base tasks are always executed on the Mac.
ideSdkPath = "(Projects > SDK Locations > Apple > Apple SDK)";
else
ideSdkPath = "(Tools > Options > Xamarin > iOS Settings > Apple SDK)";
Log.LogError (MSBStrings.E0044, AppleSdkSettings.InvalidDeveloperRoot, ideSdkPath);
Log.LogError (MSBStrings.E0044v2 /* Could not find a valid Xcode app bundle at '{0}'. Please verify that 'xcode-select -p' points to your Xcode installation. For more information see https://aka.ms/macios-missing-xcode. */, AppleSdkSettings.InvalidDeveloperRoot);
return false;
}
Log.LogMessage (MessageImportance.Low, "DeveloperRoot: {0}", currentSdk.DeveloperRoot);
Expand Down
Loading