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.

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] Remove unused parameters from the CompileEntitlement task. #18945

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,6 @@ public abstract class CompileEntitlementsTaskBase : XamarinTask {
[Required]
public string AppBundleDir { get; set; } = string.Empty;

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

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

Expand All @@ -63,14 +60,8 @@ public abstract class CompileEntitlementsTaskBase : XamarinTask {

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

[Required]
public bool IsAppExtension { get; set; }

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

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

public bool SdkIsSimulator { get; set; }

[Required]
Expand Down
3 changes: 0 additions & 3 deletions msbuild/Xamarin.Shared/Xamarin.Shared.targets
Original file line number Diff line number Diff line change
Expand Up @@ -655,17 +655,14 @@ Copyright (C) 2018 Microsoft. All rights reserved.
SessionId="$(BuildSessionId)"
Condition="'$(IsMacEnabled)' == 'true'"
AppBundleDir="$(AppBundleDir)"
AppIdentifier="$(_AppIdentifier)"
BundleIdentifier="$(_BundleIdentifier)"
CustomEntitlements="@(CustomEntitlements)"
Entitlements="$(CodesignEntitlements)"
CompiledEntitlements="$(_CompiledEntitlementsPath)"
IsAppExtension="$(IsAppExtension)"
ProvisioningProfile="$(_ProvisioningProfile)"
SdkIsSimulator="$(_SdkIsSimulator)"
SdkPlatform="$(_SdkPlatform)"
SdkVersion="$(_SdkVersion)"
SdkDevPath="$(_SdkDevPath)"
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)"
Debug="$(_BundlerDebug)"
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -138,16 +138,13 @@

<CompileEntitlements
AppBundleDir="$(HotRestartAppBundlePath)"
AppIdentifier="$(_AppIdentifier)"
BundleIdentifier="$(_BundleIdentifier)"
Entitlements="$(_HotRestartEntitlementsFile)"
CompiledEntitlements="$(HotRestartAppBundlePath)\Entitlements.plist"
IsAppExtension="$(IsAppExtension)"
ProvisioningProfile="$(_ProvisioningProfileId)"
SdkIsSimulator="$(_SdkIsSimulator)"
SdkPlatform="iPhoneOS"
SdkVersion="12.2"
SdkDevPath=" "
TargetFrameworkMoniker="$(_ComputedTargetFrameworkMoniker)" />
</Target>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,9 @@ CustomCompileEntitlements CreateEntitlementsTask (out string compiledEntitlement
var task = CreateTask<CustomCompileEntitlements> ();

task.AppBundleDir = AppBundlePath;
task.AppIdentifier = "32UV7A8CDE.com.xamarin.MySingleView";
task.BundleIdentifier = "com.xamarin.MySingleView";
task.CompiledEntitlements = new TaskItem (Path.Combine (MonoTouchProjectObjPath, "Entitlements.xcent"));
task.Entitlements = Path.Combine (Path.GetDirectoryName (GetType ().Assembly.Location), "Resources", "Entitlements.plist");
task.IsAppExtension = false;
task.ProvisioningProfile = Path.Combine (Path.GetDirectoryName (GetType ().Assembly.Location), "Resources", "profile.mobileprovision");
task.SdkPlatform = "iPhoneOS";
task.SdkVersion = "6.1";
Expand Down