Merge remote-tracking branch 'upstream/master' into mono-2019-02
This commit is contained in:
Коммит
0bcbb67a45
|
@ -1,5 +1,5 @@
|
|||
ifdef ENABLE_XAMARIN
|
||||
NEEDED_MACCORE_VERSION := 0e465b6769ed77b127bb17b770be6a6da7b7ec67
|
||||
NEEDED_MACCORE_VERSION := 71a563c89212d3a4e66b7bd387c71600d55fa6c8
|
||||
NEEDED_MACCORE_BRANCH := master
|
||||
|
||||
MACCORE_DIRECTORY := maccore
|
||||
|
|
|
@ -201,6 +201,7 @@ Copyright (C) 2014 Xamarin. All rights reserved.
|
|||
SigningKey="$(_CodeSigningKey)"
|
||||
ExtraArgs="$(CodesignExtraArgs)"
|
||||
IsAppExtension="$(IsAppExtension)"
|
||||
UseSecureTimestamp="$(UseHardenedRuntime)"
|
||||
>
|
||||
</Codesign>
|
||||
</Target>
|
||||
|
@ -250,6 +251,7 @@ Copyright (C) 2014 Xamarin. All rights reserved.
|
|||
ExtraArgs="$(CodesignExtraArgs)"
|
||||
IsAppExtension="$(IsAppExtension)"
|
||||
UseHardenedRuntime="$(UseHardenedRuntime)"
|
||||
UseSecureTimestamp="$(UseHardenedRuntime)"
|
||||
>
|
||||
</Codesign>
|
||||
</Target>
|
||||
|
|
|
@ -46,6 +46,8 @@ namespace Xamarin.MacDev.Tasks
|
|||
public bool IsAppExtension { get; set; }
|
||||
|
||||
public bool UseHardenedRuntime { get; set; }
|
||||
|
||||
public bool UseSecureTimestamp { get; set; }
|
||||
|
||||
public string ToolExe {
|
||||
get { return toolExe ?? ToolName; }
|
||||
|
@ -98,6 +100,11 @@ namespace Xamarin.MacDev.Tasks
|
|||
if (UseHardenedRuntime)
|
||||
args.Add ("-o runtime");
|
||||
|
||||
if (UseSecureTimestamp)
|
||||
args.Add ("--timestamp");
|
||||
else
|
||||
args.Add ("--timestamp=none");
|
||||
|
||||
args.Add ("--sign");
|
||||
args.AddQuoted (SigningKey);
|
||||
|
||||
|
|
|
@ -77,7 +77,7 @@ namespace BCLTests.TestRunner.Core {
|
|||
#endif
|
||||
|
||||
try {
|
||||
client = new TcpClient (hostName, port);
|
||||
client = new TcpClient (HostName, port);
|
||||
writer = new StreamWriter (client.GetStream ());
|
||||
}
|
||||
catch {
|
||||
|
|
|
@ -715,6 +715,7 @@ namespace Xamarin.MMP.Tests
|
|||
var baseOutput = TI.TestUnifiedExecutable (test);
|
||||
string baseCodesign = findCodesign (baseOutput);
|
||||
Assert.False (baseCodesign.Contains ("-o runtime"), "Base codesign");
|
||||
Assert.True (baseCodesign.Contains ("--timestamp=none"), "Base codesign timestamp");
|
||||
|
||||
test.CSProjConfig += "<UseHardenedRuntime>true</UseHardenedRuntime><CodeSignEntitlements>Entitlements.plist</CodeSignEntitlements>";
|
||||
|
||||
|
@ -732,6 +733,8 @@ namespace Xamarin.MMP.Tests
|
|||
var hardenedOutput = TI.TestUnifiedExecutable (test);
|
||||
string hardenedCodesign = findCodesign (hardenedOutput);
|
||||
Assert.True (hardenedCodesign.Contains ("-o runtime"), "Hardened codesign");
|
||||
Assert.True (hardenedCodesign.Contains ("--timestamp"), "Hardened codesign timestamp");
|
||||
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче