Skip to content

[msbuild] Remove the SdkBinPath and SdkUsrPath properties. #24450

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

Open
rolfbjarne wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[msbuild] Remove the SdkBinPath and SdkUsrPath properties. #24450

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
14 changes: 2 additions & 12 deletions msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,11 +111,7 @@
<!-- E0029: not used anymore -->
<!-- E0030: not used anymore -->
<!-- E0031: not used anymore -->

<data name="E0032" xml:space="preserve">
<value>Could not locate SDK bin directory</value>
</data>

<!-- E0032: not used anymore -->
<!-- E0033: not used anymore -->
<!-- E0034: not used anymore -->
<!-- E0035: not used anymore -->
Expand Down Expand Up @@ -294,13 +290,7 @@
<value>Could not locate the {0} '{1}' SDK at path '{}'</value>
</data>

<data name="E0085" xml:space="preserve">
<value>Could not locate the {0} '{1}' SDK usr path at '{2}'</value>
<comment>The provided SDK path is missing a 'usr' directory. The following are literal names and should not be translated: SDK, usr
{0} - The platform name, such as 'iOS'.
{1} - The version number of the SDK.
{2} - The file path of the SDK.</comment>
</data>
<!-- E0085: not used anymore -->

<data name="E0086" xml:space="preserve">
<value>Could not find a valid Xcode developer path</value>
Expand Down
18 changes: 0 additions & 18 deletions msbuild/Xamarin.MacDev.Tasks/Tasks/DetectSdkLocation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,21 +32,11 @@ public string SdkRoot {
get; set;
} = "";

[Output]
public string SdkBinPath {
get; set;
} = "";

[Output]
public string SdkDevPath {
get; set;
} = "";

[Output]
public string SdkUsrPath {
get; set;
} = "";

[Output]
public bool SdkIsSimulator {
get; set;
Expand Down Expand Up @@ -130,14 +120,6 @@ protected void EnsureSdkPath ()
SdkRoot = currentSdk.GetSdkPath (SdkVersion, SdkIsSimulator);
if (string.IsNullOrEmpty (SdkRoot))
Log.LogError (MSBStrings.E0084 /* Could not locate the {0} '{1}' SDK at path '{2}' */, PlatformName, SdkVersion, SdkRoot);

SdkUsrPath = DirExists ("SDK usr directory", Path.Combine (currentSdk.DeveloperRoot, "usr")) ?? "";
if (string.IsNullOrEmpty (SdkUsrPath))
Log.LogError (MSBStrings.E0085 /* Could not locate the {0} '{1}' SDK usr path at '{2}' */, PlatformName, SdkVersion, SdkRoot);

SdkBinPath = DirExists ("SDK bin directory", Path.Combine (SdkUsrPath, "bin")) ?? "";
if (string.IsNullOrEmpty (SdkBinPath))
Log.LogError (MSBStrings.E0032 /* Could not locate SDK bin directory */);
}

void EnsureXamarinSdkRoot ()
Expand Down
10 changes: 0 additions & 10 deletions msbuild/Xamarin.MacDev.Tasks/Tasks/XcodeCompilerToolTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ public abstract class XcodeCompilerToolTask : XamarinTask, IHasProjectDir, IHasR
[Required]
public string ResourcePrefix { get; set; } = string.Empty;

public string SdkBinPath { get; set; } = string.Empty;

[Required]
public string SdkPlatform { get; set; } = string.Empty;

Expand All @@ -53,8 +51,6 @@ public string SdkDevPath {
set { sdkDevPath = value; }
}

public string SdkUsrPath { get; set; } = string.Empty;

[Required]
public string SdkVersion { get; set; } = string.Empty;

Expand Down Expand Up @@ -184,12 +180,6 @@ protected int Compile (ITaskItem [] items, string output, ITaskItem manifest)
var environment = new Dictionary<string, string?> ();
var args = new List<string> ();

if (!string.IsNullOrEmpty (SdkBinPath))
environment.Add ("PATH", SdkBinPath);

if (!string.IsNullOrEmpty (SdkUsrPath))
environment.Add ("XCODE_DEVELOPER_USR_PATH", SdkUsrPath);

if (!string.IsNullOrEmpty (SdkDevPath))
environment.Add ("DEVELOPER_DIR", SdkDevPath);

Expand Down
9 changes: 0 additions & 9 deletions msbuild/Xamarin.MacDev.Tasks/Tasks/XcodeTool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,9 @@ public abstract class XcodeToolTaskBase : XamarinTask, IHasProjectDir, IHasResou
[Required]
public string ResourcePrefix { get; set; } = string.Empty;

[Required]
public string SdkBinPath { get; set; } = string.Empty;

[Required]
public string SdkDevPath { get; set; } = string.Empty;

[Required]
public string SdkUsrPath { get; set; } = string.Empty;

public string ToolExe {
get { return toolExe ?? ToolName; }
set { toolExe = value; }
Expand Down Expand Up @@ -107,9 +101,6 @@ int ExecuteTool (ITaskItem input, ITaskItem output)
var environment = new Dictionary<string, string?> ();
var args = new List<string> ();

environment.Add ("PATH", SdkBinPath);
environment.Add ("XCODE_DEVELOPER_USR_PATH", SdkUsrPath);

AppendCommandLineArguments (environment, args, input, output);

var rv = ExecuteAsync (GetFullPathToTool (), args, environment: environment).Result;
Expand Down
9 changes: 1 addition & 8 deletions msbuild/Xamarin.Shared/Xamarin.Shared.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -907,8 +907,6 @@ Copyright (C) 2018 Microsoft. All rights reserved.
ProjectDir="$(MSBuildProjectDirectory)"
ResourcePrefix="$(_ResourcePrefix)"
SdkDevPath="$(_SdkDevPath)"
SdkBinPath="$(_SdkBinPath)"
SdkUsrPath="$(_SdkUsrPath)"
SdkRoot="$(_SdkRoot)"
SdkPlatform="$(_SdkPlatform)"
SdkVersion="$(_SdkVersion)"
Expand Down Expand Up @@ -1043,8 +1041,6 @@ Copyright (C) 2018 Microsoft. All rights reserved.
ProjectDir="$(MSBuildProjectDirectory)"
ResourcePrefix="$(_ResourcePrefix)"
SdkDevPath="$(_SdkDevPath)"
SdkBinPath="$(_SdkBinPath)"
SdkUsrPath="$(_SdkUsrPath)"
SdkPlatform="$(_SdkPlatform)"
SdkVersion="$(_SdkVersion)"
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
Expand Down Expand Up @@ -1457,8 +1453,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.
ProjectDir="$(MSBuildProjectDirectory)"
ResourcePrefix="$(_ResourcePrefix)"
SdkDevPath="$(_SdkDevPath)"
SdkBinPath="$(_SdkBinPath)"
SdkUsrPath="$(_SdkUsrPath)">
>
<Output TaskParameter="BundleResources" ItemName="_BundleResourceWithLogicalName" />

<!-- Local items to be persisted to items files -->
Expand Down Expand Up @@ -2081,9 +2076,7 @@ Copyright (C) 2018 Microsoft. All rights reserved.

<Output TaskParameter="SdkVersion" PropertyName="_SdkVersion" />
<Output TaskParameter="SdkRoot" PropertyName="_SdkRoot" />
<Output TaskParameter="SdkBinPath" PropertyName="_SdkBinPath" />
<Output TaskParameter="SdkDevPath" PropertyName="_SdkDevPath" />
<Output TaskParameter="SdkUsrPath" PropertyName="_SdkUsrPath" />
<Output TaskParameter="SdkPlatform" PropertyName="_SdkPlatform" />
<Output TaskParameter="SdkIsSimulator" PropertyName="_SdkIsSimulator" />
<Output TaskParameter="XamarinSdkRoot" PropertyName="_XamarinSdkRoot" />
Expand Down
4 changes: 0 additions & 4 deletions tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/ACToolTaskTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ ACTool CreateACToolTask (ApplePlatform platform, string projectDir, out string i
var sdk = Sdks.GetAppleSdk (platform);
var version = AppleSdkVersion.UseDefault.ToString ();
var root = sdk.GetSdkPath (version, false);
var usr = Path.Combine (sdk.DeveloperRoot, "usr");
var bin = Path.Combine (usr, "bin");
string sdkPlatform;
var uiDeviceFamily = "";

Expand Down Expand Up @@ -66,8 +64,6 @@ ACTool CreateACToolTask (ApplePlatform platform, string projectDir, out string i
task.SdkDevPath = Configuration.xcode_root;
task.SdkPlatform = sdkPlatform;
task.SdkVersion = version.ToString ();
task.SdkUsrPath = usr;
task.SdkBinPath = bin;
task.TargetFrameworkMoniker = TargetFramework.GetTargetFramework (platform).ToString ();
task.UIDeviceFamily = uiDeviceFamily;
return task;
Expand Down
4 changes: 0 additions & 4 deletions tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/IBToolTaskTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ IBTool CreateIBToolTask (ApplePlatform framework, string projectDir, string inte
var sdk = Sdks.GetSdk (framework);
var version = AppleSdkVersion.GetDefault (sdk, false);
var root = sdk.GetSdkPath (version, false);
var usr = Path.Combine (sdk.DeveloperRoot, "usr");
var bin = Path.Combine (usr, "bin");
string platform;

switch (framework) {
Expand All @@ -50,8 +48,6 @@ IBTool CreateIBToolTask (ApplePlatform framework, string projectDir, string inte
task.SdkDevPath = Configuration.xcode_root;
task.SdkPlatform = platform;
task.SdkVersion = version.ToString ();
task.SdkUsrPath = usr;
task.SdkBinPath = bin;
task.SdkRoot = root;
task.TargetFrameworkMoniker = TargetFramework.DotNet_iOS_String;
return task;
Expand Down
Loading