diff --git a/src/mono/msbuild/apple/build/AppleApp.targets b/src/mono/msbuild/apple/build/AppleApp.targets index 6e97c7b016c847..bf637dcc8b7ca8 100644 --- a/src/mono/msbuild/apple/build/AppleApp.targets +++ b/src/mono/msbuild/apple/build/AppleApp.targets @@ -36,7 +36,7 @@ - <_CommonLinkerArgs Condition="'$(TargetOS)' != 'tvos'" Include="-framework GSS" /> + <_CommonLinkerArgs Condition="'$(_IsLibraryMode)' == 'true' and '$(TargetOS)' != 'tvos' and '$(TargetOS)' != 'tvossimulator'" Include="-framework GSS" /> diff --git a/src/tasks/AppleAppBuilder/Xcode.cs b/src/tasks/AppleAppBuilder/Xcode.cs index ed9fbf8c978865..6116fad4bceb88 100644 --- a/src/tasks/AppleAppBuilder/Xcode.cs +++ b/src/tasks/AppleAppBuilder/Xcode.cs @@ -400,12 +400,20 @@ public string GenerateCMake( toLink += $" {asmLinkFile}{Environment.NewLine}"; } + string frameworks = ""; + if ((Target == TargetNames.iOS) || (Target == TargetNames.iOSsim) || (Target == TargetNames.MacCatalyst)) + { + frameworks = "\"-framework GSS\""; + } + string appLinkerArgs = ""; foreach(string linkerArg in extraLinkerArgs) { appLinkerArgs += $" \"{linkerArg}\"{Environment.NewLine}"; } + appLinkerArgs += $" {frameworks}{Environment.NewLine}"; + cmakeLists = cmakeLists.Replace("%NativeLibrariesToLink%", toLink); cmakeLists = cmakeLists.Replace("%APP_LINKER_ARGS%", appLinkerArgs); cmakeLists = cmakeLists.Replace("%AotSources%", aotSources);