diff --git a/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx b/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx index 492695197ce5..cae2cb561191 100644 --- a/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx +++ b/msbuild/Xamarin.Localization.MSBuild/MSBStrings.resx @@ -111,11 +111,7 @@ - - - Could not locate SDK bin directory - - + @@ -294,13 +290,7 @@ Could not locate the {0} '{1}' SDK at path '{}' - - Could not locate the {0} '{1}' SDK usr path at '{2}' - 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. - + Could not find a valid Xcode developer path diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/DetectSdkLocation.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/DetectSdkLocation.cs index 0249f04a0463..8b62df6c88e7 100644 --- a/msbuild/Xamarin.MacDev.Tasks/Tasks/DetectSdkLocation.cs +++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/DetectSdkLocation.cs @@ -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; @@ -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 () diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/XcodeCompilerToolTask.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/XcodeCompilerToolTask.cs index c7f8762a91fd..38ad0fc3bc96 100644 --- a/msbuild/Xamarin.MacDev.Tasks/Tasks/XcodeCompilerToolTask.cs +++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/XcodeCompilerToolTask.cs @@ -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; @@ -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; @@ -184,12 +180,6 @@ protected int Compile (ITaskItem [] items, string output, ITaskItem manifest) var environment = new Dictionary (); var args = new List (); - 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); diff --git a/msbuild/Xamarin.MacDev.Tasks/Tasks/XcodeTool.cs b/msbuild/Xamarin.MacDev.Tasks/Tasks/XcodeTool.cs index d01c1bbd408b..ee357deeaa0a 100644 --- a/msbuild/Xamarin.MacDev.Tasks/Tasks/XcodeTool.cs +++ b/msbuild/Xamarin.MacDev.Tasks/Tasks/XcodeTool.cs @@ -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; } @@ -107,9 +101,6 @@ int ExecuteTool (ITaskItem input, ITaskItem output) var environment = new Dictionary (); var args = new List (); - environment.Add ("PATH", SdkBinPath); - environment.Add ("XCODE_DEVELOPER_USR_PATH", SdkUsrPath); - AppendCommandLineArguments (environment, args, input, output); var rv = ExecuteAsync (GetFullPathToTool (), args, environment: environment).Result; diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.targets index 96d29ef0854e..83d5757f6bde 100644 --- a/msbuild/Xamarin.Shared/Xamarin.Shared.targets +++ b/msbuild/Xamarin.Shared/Xamarin.Shared.targets @@ -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)" @@ -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)" @@ -1457,8 +1453,7 @@ Copyright (C) 2018 Microsoft. All rights reserved. ProjectDir="$(MSBuildProjectDirectory)" ResourcePrefix="$(_ResourcePrefix)" SdkDevPath="$(_SdkDevPath)" - SdkBinPath="$(_SdkBinPath)" - SdkUsrPath="$(_SdkUsrPath)"> + > @@ -2081,9 +2076,7 @@ Copyright (C) 2018 Microsoft. All rights reserved. - - diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/ACToolTaskTest.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/ACToolTaskTest.cs index 2a6b2e271cbf..75f52139b7af 100644 --- a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/ACToolTaskTest.cs +++ b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/ACToolTaskTest.cs @@ -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 = ""; @@ -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; diff --git a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/IBToolTaskTests.cs b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/IBToolTaskTests.cs index e419c6de6cca..8c301b35e3c8 100644 --- a/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/IBToolTaskTests.cs +++ b/tests/msbuild/Xamarin.MacDev.Tasks.Tests/TaskTests/IBToolTaskTests.cs @@ -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) { @@ -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;