diff --git a/Examples/CMakeNinjaHelloWorld/config.dsc b/Examples/CMakeNinjaHelloWorld/config.dsc index bf5e38e10..33e45cb1c 100644 --- a/Examples/CMakeNinjaHelloWorld/config.dsc +++ b/Examples/CMakeNinjaHelloWorld/config.dsc @@ -5,8 +5,5 @@ config({ root: d`.`, moduleName: "CMakeNinjaProject", } - ], - - // Inbox SDK is not currently working with the CMake resolver - disableInBoxSdkSourceResolver: true, + ] }); \ No newline at end of file diff --git a/Examples/NinjaHelloWorld/config.dsc b/Examples/NinjaHelloWorld/config.dsc index 5af284ffa..71aa66a1a 100644 --- a/Examples/NinjaHelloWorld/config.dsc +++ b/Examples/NinjaHelloWorld/config.dsc @@ -6,8 +6,5 @@ config({ moduleName: "HelloWorld", keepProjectGraphFile: true, } - ], - - // Inbox SDK is not currently working with the Ninja resolver - disableInBoxSdkSourceResolver: true, + ] }); \ No newline at end of file diff --git a/Public/Src/FrontEnd/Core/FrontEndHostController.cs b/Public/Src/FrontEnd/Core/FrontEndHostController.cs index 712ea3a36..237ddb969 100644 --- a/Public/Src/FrontEnd/Core/FrontEndHostController.cs +++ b/Public/Src/FrontEnd/Core/FrontEndHostController.cs @@ -1267,11 +1267,11 @@ namespace BuildXL.FrontEnd.Core AbsolutePath configFilePath = configuration.Layout.PrimaryConfigFile; var resolverSettings = new List(); + var resolverNames = new HashSet(); if (configuration.Resolvers != null) { // Ensure all resolvers have a name. int i = 0; - var resolverNames = new HashSet(); foreach (var resolver in configuration.Resolvers) { if (!string.IsNullOrEmpty(resolver.Name)) @@ -1311,9 +1311,13 @@ namespace BuildXL.FrontEnd.Core // If configured, add an implicit DScript resolver that owns all in-box SDKs deployed // alongside bxl binaries - if (TryCreateInBoxSDKResolver(configFilePath, out IDScriptResolverSettings settings)) + // The Ninja resolver is incompatible with the inbox SDK resolver so we disable it by default - see work item #1830391 + if (!resolverNames.Contains(KnownResolverKind.NinjaResolverKind)) { - resolverSettings.Add(settings); + if (TryCreateInBoxSDKResolver(configFilePath, out IDScriptResolverSettings settings)) + { + resolverSettings.Add(settings); + } } if (!existExplicitDefaultSourceResolver)