From 9158dcc6ffec9163254cbf1acb5ebc9975307794 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Tue, 27 Jul 2021 11:04:48 +0200
Subject: [PATCH] [msbuild] Make code signing required when archiving a macOS
 or Mac Catalyst app.

We fail later with an uninformative error ('The "Archive" task was not given a
value for the required parameter "SigningKey"') otherwise, and this way the
user doesn't have to manually enable signing to avoid the this error.
---
 msbuild/Xamarin.Shared/Xamarin.Shared.props | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.props b/msbuild/Xamarin.Shared/Xamarin.Shared.props
index 789032feaacd..f1ccd435c603 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.props
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.props
@@ -148,6 +148,8 @@ Copyright (C) 2020 Microsoft. All rights reserved.
 	<PropertyGroup Condition="'$(_PlatformName)' == 'macOS' Or '$(_PlatformName)' == 'MacCatalyst'">
 		<!-- macOS and Mac Catalyst projects use the 'EnableCodeSigning' variable to enable code signing -->
 		<_RequireCodeSigning Condition="'$(_RequireCodeSigning)' == ''">$(EnableCodeSigning)</_RequireCodeSigning>
+		<!-- Signing must be enabled when archiving -->
+		<_RequireCodeSigning Condition="'$(_RequireCodeSigning)' == '' And '$(ArchiveOnBuild)' == 'true'">true</_RequireCodeSigning>
 		<!-- Extensions must be signed, so make sure they are -->
 		<_RequireCodeSigning Condition="'$(_RequireCodeSigning)' == '' And '$(IsAppExtension)' == 'true'">true</_RequireCodeSigning>
 		<!-- Otherwise code signing is disabled by default -->