Fix for conflict between #13078 and #13487

Azure · Feb 29, 2024 · 2577352 · 2577352
1 parent dbc82a2
commit 2577352
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Bicep.Core.IntegrationTests/Extensibility/RadiusCompatibilityTests.cs b/src/Bicep.Core.IntegrationTests/Extensibility/RadiusCompatibilityTests.cs
@@ -13,12 +13,12 @@ namespace Bicep.Core.IntegrationTests.Extensibility;
 [TestClass]
 public class RadiusCompatibilityTests
 {
-    private static ServiceBuilder GetServiceBuilder(IFileSystem fileSystem, string registryHost, string repositoryPath, bool extensibilityEnabledBool, bool providerRegistryBool)
+    private static ServiceBuilder GetServiceBuilder(IFileSystem fileSystem, string registryHost, string repositoryPath)
     {
         var clientFactory = RegistryHelper.CreateMockRegistryClient(registryHost, repositoryPath);
 
         return new ServiceBuilder()
-            .WithFeatureOverrides(new(ExtensibilityEnabled: extensibilityEnabledBool, ProviderRegistry: providerRegistryBool))
+            .WithFeatureOverrides(new(ExtensibilityEnabled: true, ProviderRegistry: true))
             .WithFileSystem(fileSystem)
             .WithContainerRegistryClientFactory(clientFactory);
     }
@@ -30,7 +30,7 @@ public async Task Radius_identifier_passing_works_as_defined()
         var registry = "example.azurecr.io";
         var repository = $"test/radius";
 
-        var services = GetServiceBuilder(new MockFileSystem(), registry, repository, true, true);
+        var services = GetServiceBuilder(new MockFileSystem(), registry, repository);
 
         var tgzData = ThirdPartyTypeHelper.GetMockRadiusTypesTgz();
         await RegistryHelper.PublishProviderToRegistryAsync(services.Build(), $"br:{registry}/{repository}:1.0.0", tgzData);

diff --git a/src/Bicep.Core/Workspaces/SourceFileGroupingBuilder.cs b/src/Bicep.Core/Workspaces/SourceFileGroupingBuilder.cs
@@ -301,7 +301,7 @@ private void PopulateProviderDeclarations(BicepSourceFile file, IFeatureProvider
                 this.providerDescriptorBundleBuilderBySourceFile[file] = providerBundleBuilder = new ProviderDescriptorBundleBuilder();
 
             }
-            if (featureProvider.DynamicTypeLoadingEnabled)
+            if (featureProvider.DynamicTypeLoadingEnabled || featureProvider.ProviderRegistryEnabled)
             {
                 ProcessImplicitProviderDeclarations(file, providerBundleBuilder, config);
                 var descriptor = ResourceTypesProviderDescriptor.CreateBuiltInProviderDescriptor(
@@ -391,7 +391,7 @@ private ResultWithDiagnostic<ResourceTypesProviderDescriptor> TryGetDescriptorFo
 
             if (providerDeclarationSyntax.Specification is LegacyProviderSpecification { } legacySpecification)
             {
-                if (!featureProvider.DynamicTypeLoadingEnabled)
+                if (!featureProvider.DynamicTypeLoadingEnabled && !featureProvider.ProviderRegistryEnabled)
                 {
                     return new(ResourceTypesProviderDescriptor.CreateBuiltInProviderDescriptor(
                         legacySpecification.NamespaceIdentifier,
@@ -402,7 +402,7 @@ private ResultWithDiagnostic<ResourceTypesProviderDescriptor> TryGetDescriptorFo
                 return new(x => x.ExpectedProviderSpecification());
             }
 
-            if (!featureProvider.DynamicTypeLoadingEnabled)
+            if (!featureProvider.DynamicTypeLoadingEnabled && !featureProvider.ProviderRegistryEnabled)
             {
                 return new(x => x.UnrecognizedProvider(providerDeclarationSyntax.Specification.NamespaceIdentifier));
             }