Skip to content

[msbuild] Bump Xamarin.MacDev and use AppleSdkVersion instead of MacOSXSdkVersion/IPhoneSdkVersion. #10622

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
rolfbjarne merged 1 commit into from
Feb 12, 2021
Merged

[msbuild] Bump Xamarin.MacDev and use AppleSdkVersion instead of MacOSXSdkVersion/IPhoneSdkVersion. #10622

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
2 changes: 1 addition & 1 deletion external/Xamarin.MacDev
Open in desktop
Submodule Xamarin.MacDev updated from fae023 to 02d6d0
3 changes: 2 additions & 1 deletion msbuild/Xamarin.Mac.Tasks.Core/Tasks/DetectSdkLocationsTaskBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ public abstract class DetectSdkLocationsTaskBase : DetectSdkLocationsCoreTaskBas
{
protected override IAppleSdkVersion GetDefaultSdkVersion ()
{
return MacOSXSdkVersion.GetDefault (CurrentSdk);
var v = CurrentSdk.GetInstalledSdkVersions (false);
return v.Count > 0 ? v [v.Count - 1] : AppleSdkVersion.UseDefault;
}

protected override string GetDefaultXamarinSdkRoot ()
Expand Down
6 changes: 3 additions & 3 deletions msbuild/Xamarin.iOS.Tasks.Core/Tasks/CompileAppManifestTaskCore.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ namespace Xamarin.iOS.Tasks
public abstract class CompileAppManifestTaskCore : CompileAppManifestTaskBase
{
IPhoneDeviceType supportedDevices;
IPhoneSdkVersion sdkVersion;
AppleSdkVersion sdkVersion;

bool IsIOS { get { return Platform == ApplePlatform.iOS; } }

protected override bool Compile (PDictionary plist)
{
var currentSDK = Sdks.GetAppleSdk (Platform);

sdkVersion = IPhoneSdkVersion.Parse (DefaultSdkVersion);
sdkVersion = AppleSdkVersion.Parse (DefaultSdkVersion);
if (!currentSDK.SdkIsInstalled (sdkVersion, SdkIsSimulator)) {
Log.LogError (null, null, null, null, 0, 0, 0, 0, MSBStrings.E0013, Platform, sdkVersion);
return false;
Expand Down Expand Up @@ -295,7 +295,7 @@ void Validation (PDictionary plist)
var supportsIPad = (supportedDevices & IPhoneDeviceType.IPad) != 0;

// Validation...
if (!IsAppExtension && sdkVersion >= IPhoneSdkVersion.V3_2) {
if (!IsAppExtension && sdkVersion >= AppleSdkVersion.V3_2) {
IPhoneOrientation orientation;

if (supportsIPhone) {
Expand Down
2 changes: 1 addition & 1 deletion msbuild/Xamarin.iOS.Tasks.Core/Tasks/DetectSdkLocationsTaskBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public abstract class DetectSdkLocationsTaskBase : DetectSdkLocationsCoreTaskBas
{
protected override IAppleSdkVersion GetDefaultSdkVersion ()
{
return IPhoneSdkVersion.UseDefault;
return AppleSdkVersion.UseDefault;
}

public override bool Execute ()
Expand Down
8 changes: 4 additions & 4 deletions msbuild/Xamarin.iOS.Tasks.Core/Tasks/ResolveNativeWatchAppTaskBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ bool IsWatchFramework {
public override bool Execute ()
{
var currentSdk = Sdks.GetSdk (TargetFrameworkMoniker);
IPhoneSdkVersion version;
AppleSdkVersion version;
string sdk_path;

if (IsWatchFramework) {
if (!IPhoneSdkVersion.TryParse (SdkVersion, out version)) {
if (!AppleSdkVersion.TryParse (SdkVersion, out version)) {
Log.LogError (MSBStrings.E0066, SdkVersion);
return false;
}
Expand All @@ -60,12 +60,12 @@ public override bool Execute ()
return false;
}

if (!IPhoneSdkVersion.TryParse (SdkVersion, out version)) {
if (!AppleSdkVersion.TryParse (SdkVersion, out version)) {
Log.LogError (MSBStrings.E0066, SdkVersion);
return false;
}

if (version < IPhoneSdkVersion.V8_2) {
if (version < AppleSdkVersion.V8_2) {
Log.LogError (MSBStrings.E0069, version);
return false;
}
Expand Down
2 changes: 1 addition & 1 deletion ...Xamarin.MacDev.Tasks.Tests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_iOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class GeneratePlistTaskTests_iOS : GeneratePlistTaskTests_Core
public override void ConfigureTask ()
{
base.ConfigureTask ();
Task.DefaultSdkVersion = Sdks.IOS.GetClosestInstalledSdk (IPhoneSdkVersion.V6_1, true).ToString ();
Task.DefaultSdkVersion = Sdks.IOS.GetClosestInstalledSdk (AppleSdkVersion.V6_1, true).ToString ();
Task.TargetFrameworkMoniker = "Xamarin.iOS,v1.0";
Task.TargetArchitectures = "ARM64";
}
Expand Down
2 changes: 1 addition & 1 deletion ...amarin.MacDev.Tasks.Tests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_tvOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class GeneratePlistTaskTests_tvOS : GeneratePlistTaskTests_Core
public override void ConfigureTask ()
{
base.ConfigureTask ();
Task.DefaultSdkVersion = Sdks.TVOS.GetClosestInstalledSdk (IPhoneSdkVersion.V9_0, true).ToString ();
Task.DefaultSdkVersion = Sdks.TVOS.GetClosestInstalledSdk (AppleSdkVersion.V9_0, true).ToString ();
Task.TargetFrameworkMoniker = "Xamarin.TVOS,v1.0";
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...rin.MacDev.Tasks.Tests/TaskTests/GeneratePlistTaskTests/GeneratePlistTaskTests_watchOS.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public abstract class GeneratePlistTaskTests_watchOS: GeneratePlistTaskTests_Cor
public override void ConfigureTask ()
{
base.ConfigureTask ();
Task.DefaultSdkVersion = Sdks.Watch.GetClosestInstalledSdk (IPhoneSdkVersion.V2_0, true).ToString ();
Task.DefaultSdkVersion = Sdks.Watch.GetClosestInstalledSdk (AppleSdkVersion.V2_0, true).ToString ();
Task.TargetFrameworkMoniker = "Xamarin.WatchOS,v1.0";
}
}
Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -21,7 +21,7 @@ IBTool CreateIBToolTask (ApplePlatform framework, string projectDir, string inte
{
var interfaceDefinitions = new List<ITaskItem> ();
var sdk = Sdks.GetSdk (framework);
var version = IPhoneSdkVersion.GetDefault (sdk, false);
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");
Expand Down