Skip to content

Commit 24d0a75

Browse files
committed
ApkSigningAlgorithm is not private and should not be prefixed with _
1 parent 03027bd commit 24d0a75

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/Xamarin.Android.Build.Tasks/Tasks/AndroidSignPackage.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ public class AndroidSignPackage : AndroidToolTask
3232

3333
public string TimestampAuthorityCertificateAlias { get; set; }
3434

35-
public string SigningAlgorithm { get; set; }
35+
public string SigningAlgorithm { get; set; }
3636

37-
protected override string GenerateCommandLineCommands ()
37+
protected override string GenerateCommandLineCommands ()
3838
{
3939
var cmd = new CommandLineBuilder ();
4040

@@ -44,8 +44,8 @@ protected override string GenerateCommandLineCommands ()
4444
cmd.AppendSwitchIfNotNull ("-storepass ", StorePass);
4545
cmd.AppendSwitchIfNotNull ("-keypass ", KeyPass);
4646
cmd.AppendSwitchIfNotNull ("-digestalg ", "SHA1");
47-
cmd.AppendSwitchIfNotNull ("-sigalg ", string.IsNullorWitespace(SigningAlgorithm) ? "md5withRSA" : SigningAlgorithm);
48-
cmd.AppendSwitchIfNotNull ("-signedjar ", String.Format ("{0}{1}{2}-Signed-Unaligned.apk", SignedApkDirectory, Path.DirectorySeparatorChar, Path.GetFileNameWithoutExtension (UnsignedApk)));
47+
cmd.AppendSwitchIfNotNull ("-sigalg ", string.IsNullorWitespace(SigningAlgorithm) ? "md5withRSA" :SigningAlgorithm);
48+
cmd.AppendSwitchIfNotNull ("-signedjar ", String.Format ("{0}{1}{2}-Signed-Unaligned.apk", SignedApkDirectory, Path.DirectorySeparatorChar, Path.GetFileNameWithoutExtension (UnsignedApk)));
4949

5050
cmd.AppendFileNameIfNotNull (UnsignedApk);
5151
cmd.AppendSwitch (KeyAlias);

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2439,7 +2439,7 @@ because xbuild doesn't support framework reference assemblies.
24392439
ToolExe="$(JarsignerToolExe)"
24402440
TimestampAuthorityUrl="$(JarsignerTimestampAuthorityUrl)"
24412441
TimestampAuthorityCertificateAlias="$(JarsignerTimestampAuthorityCertificateAlias)"
2442-
SigningAlgorithm="$(_ApkSigningAlgorithm)"
2442+
SigningAlgorithm="$(ApkSigningAlgorithm)"
24432443
/>
24442444
<Message Text="Signed android package '$(ApkFileSigned)'" />
24452445
<ItemGroup>

0 commit comments

Comments
 (0)