diff --git a/src/Bicep.Cli.IntegrationTests/packages.lock.json b/src/Bicep.Cli.IntegrationTests/packages.lock.json index 76760d24238..bcdc4c31a2d 100644 --- a/src/Bicep.Cli.IntegrationTests/packages.lock.json +++ b/src/Bicep.Cli.IntegrationTests/packages.lock.json @@ -110,8 +110,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -121,20 +121,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -1979,9 +1979,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.Cli.UnitTests/packages.lock.json b/src/Bicep.Cli.UnitTests/packages.lock.json index 7a0c9ab0268..58d57ba2ae1 100644 --- a/src/Bicep.Cli.UnitTests/packages.lock.json +++ b/src/Bicep.Cli.UnitTests/packages.lock.json @@ -110,8 +110,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -121,20 +121,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -1805,9 +1805,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.Cli/packages.lock.json b/src/Bicep.Cli/packages.lock.json index 96376e9170c..8229cb726b4 100644 --- a/src/Bicep.Cli/packages.lock.json +++ b/src/Bicep.Cli/packages.lock.json @@ -91,8 +91,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -102,20 +102,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -1742,9 +1742,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.Core.IntegrationTests/packages.lock.json b/src/Bicep.Core.IntegrationTests/packages.lock.json index c9191a2d852..0a963cc7dc6 100644 --- a/src/Bicep.Core.IntegrationTests/packages.lock.json +++ b/src/Bicep.Core.IntegrationTests/packages.lock.json @@ -110,8 +110,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -121,20 +121,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -1979,9 +1979,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.Core.Samples/packages.lock.json b/src/Bicep.Core.Samples/packages.lock.json index c7320d4af8f..f00ecd18582 100644 --- a/src/Bicep.Core.Samples/packages.lock.json +++ b/src/Bicep.Core.Samples/packages.lock.json @@ -110,8 +110,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -121,20 +121,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -1979,9 +1979,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.Core.UnitTests/Semantics/ArmTemplateSemanticModelTests.cs b/src/Bicep.Core.UnitTests/Semantics/ArmTemplateSemanticModelTests.cs index cbbe7b71704..62fe78bb634 100644 --- a/src/Bicep.Core.UnitTests/Semantics/ArmTemplateSemanticModelTests.cs +++ b/src/Bicep.Core.UnitTests/Semantics/ArmTemplateSemanticModelTests.cs @@ -1,6 +1,7 @@ // Copyright (c) Microsoft Corporation. // Licensed under the MIT License. +using System.Linq; using Bicep.Core.Semantics; using Bicep.Core.TypeSystem; using Bicep.Core.Workspaces; @@ -213,6 +214,7 @@ public void Model_handles_missing_type_reference_targets() ""$schema"": ""https://schema.management.azure.com/schemas/2019-04-01/deploymentTemplate.json#"", ""contentVersion"": ""1.0.0.0"", ""languageVersion"": ""1.9-experimental"", + ""definitions"": {}, ""resources"": {}, ""parameters"": { ""refParam"": { @@ -223,6 +225,9 @@ public void Model_handles_missing_type_reference_targets() ", "refParam"); parameterType.Type.Should().BeOfType(); + var loadError = parameterType.Type.GetDiagnostics().Single(); + loadError.Code.Should().Be("BCP319"); + loadError.Message.Should().Be("The type at \"parameters.refParam.$ref\" could not be resolved by the ARM JSON template engine. Original error message: \"Invalid reference encountered at 'parameters.refParam.$ref'. '#/definitions' not found in template. Please see https://aka.ms/arm-syntax-parameters for usage details.\""); } [TestMethod] diff --git a/src/Bicep.Core.UnitTests/packages.lock.json b/src/Bicep.Core.UnitTests/packages.lock.json index 121757f8093..37632bd6bbe 100644 --- a/src/Bicep.Core.UnitTests/packages.lock.json +++ b/src/Bicep.Core.UnitTests/packages.lock.json @@ -143,8 +143,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -154,20 +154,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -1988,9 +1988,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.Core/Bicep.Core.csproj b/src/Bicep.Core/Bicep.Core.csproj index 9c9c140118f..1e5cfb280d8 100644 --- a/src/Bicep.Core/Bicep.Core.csproj +++ b/src/Bicep.Core/Bicep.Core.csproj @@ -29,9 +29,9 @@ - - - + + + diff --git a/src/Bicep.Core/Diagnostics/DiagnosticBuilder.cs b/src/Bicep.Core/Diagnostics/DiagnosticBuilder.cs index 78ecdefcd2c..aee3c45f760 100644 --- a/src/Bicep.Core/Diagnostics/DiagnosticBuilder.cs +++ b/src/Bicep.Core/Diagnostics/DiagnosticBuilder.cs @@ -1782,21 +1782,6 @@ public ErrorDiagnostic NestedRuntimePropertyAccessNotSupported(string? resourceS "BCP311", $@"The provided index value of ""{indexSought}"" is not valid for type ""{typeName}"". Indexes for this type must be between 0 and {tupleLength - 1}"); - public ErrorDiagnostic CyclicArmTypeRefs(IEnumerable cycleLinks) => new( - TextSpan, - "BCP312", - $@"Type reference cycle detected in the linked ARM JSON file (""{string.Join(" -> ", cycleLinks.Select(l => $@"""{l}"""))}"")."); - - public ErrorDiagnostic ArmTypeRefTargetNotFound(string refSansTarget) => new( - TextSpan, - "BCP313", - $@"The ""{refSansTarget}"" type definition could not be found in the linked ARM JSON file."); - - public ErrorDiagnostic ArmTypeDefHasNoTypeOrRef(string invalidTypeDef) => new( - TextSpan, - "BCP314", - $@"The ""{invalidTypeDef}"" type definition in the linked ARM JSON file is invalid because it has neither a ""type"" property nor a ""$ref"" property."); - public ErrorDiagnostic MultipleAdditionalPropertiesDeclarations() => new( TextSpan, "BCP315", @@ -1824,6 +1809,11 @@ public ErrorDiagnostic NestedRuntimePropertyAccessNotSupported(string? resourceS false, CodeFixKind.QuickFix, new(baseExpression.Span, SyntaxFactory.AsNonNullable(baseExpression).ToTextPreserveFormatting()))); + + public ErrorDiagnostic UnresolvableArmJsonType(string errorSource, string message) => new( + TextSpan, + "BCP319", + $@"The type at ""{errorSource}"" could not be resolved by the ARM JSON template engine. Original error message: ""{message}"""); } public static DiagnosticBuilderInternal ForPosition(TextSpan span) diff --git a/src/Bicep.Core/Semantics/ArmTemplateSemanticModel.cs b/src/Bicep.Core/Semantics/ArmTemplateSemanticModel.cs index fddec1e549d..f0627309b2c 100644 --- a/src/Bicep.Core/Semantics/ArmTemplateSemanticModel.cs +++ b/src/Bicep.Core/Semantics/ArmTemplateSemanticModel.cs @@ -2,7 +2,6 @@ // Licensed under the MIT License. using System; -using System.Collections.Concurrent; using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics; @@ -11,6 +10,8 @@ using Azure.Deployments.Core.Definitions.Schema; using Azure.Deployments.Core.Entities; using Azure.Deployments.Expression.Extensions; +using Azure.Deployments.Templates.Engines; +using Azure.Deployments.Templates.Exceptions; using Azure.Deployments.Templates.Extensions; using Bicep.Core.Diagnostics; using Bicep.Core.Parsing; @@ -30,8 +31,6 @@ public class ArmTemplateSemanticModel : ISemanticModel private readonly Lazy> outputsLazy; - private readonly ConcurrentDictionary templateTypeDefinitions = new(); - public ArmTemplateSemanticModel(ArmTemplateFile sourceFile) { Trace.WriteLine($"Building semantic model for {sourceFile.FileUri}"); @@ -145,97 +144,68 @@ public bool HasErrors() TemplateParameterType.String when TryCreateUnboundResourceTypeParameter(GetMetadata(parameter), out var resourceType) => resourceType, - _ => GetType((ITemplateSchemaNode) parameter), + _ => GetType((ITemplateSchemaNode)parameter), }; private TypeSymbol GetType(ITemplateSchemaNode schemaNode) { - if (schemaNode.Ref?.Value is string @ref) + try { + var resolved = TemplateEngine.ResolveSchemaReferences(SourceFile.Template, schemaNode); - return templateTypeDefinitions.GetOrAdd(@ref, ResolveTypeReference); - } + var bicepType = resolved.Type.Value switch + { + TemplateParameterType.String when TryCreateUnboundResourceTypeParameter(resolved.Metadata?.Value, out var resourceType) => resourceType, + TemplateParameterType.String => GetPrimitiveType(resolved, t => t.IsTextBasedJTokenType(), LanguageConstants.TypeNameString, LanguageConstants.LooseString), + TemplateParameterType.Int => GetPrimitiveType(resolved, t => t.Type == JTokenType.Integer, LanguageConstants.TypeNameInt, LanguageConstants.LooseInt), + TemplateParameterType.Bool => GetPrimitiveType(resolved, t => t.Type == JTokenType.Boolean, LanguageConstants.TypeNameBool, LanguageConstants.LooseBool), + TemplateParameterType.Array => GetArrayType(resolved), + TemplateParameterType.Object => GetObjectType(SourceFile.Template!, resolved), + TemplateParameterType.SecureString => LanguageConstants.SecureString, + TemplateParameterType.SecureObject => GetObjectType(SourceFile.Template!, resolved, TypeSymbolValidationFlags.IsSecure), + _ => ErrorType.Empty(), + }; - return schemaNode.Type.Value switch - { - TemplateParameterType.String when TryCreateUnboundResourceTypeParameter(GetMetadata(schemaNode), out var resourceType) => resourceType, - TemplateParameterType.String => GetPrimitiveType(schemaNode, t => t.IsTextBasedJTokenType(), LanguageConstants.TypeNameString, LanguageConstants.LooseString), - TemplateParameterType.Int => GetPrimitiveType(schemaNode, t => t.Type == JTokenType.Integer, LanguageConstants.TypeNameInt, LanguageConstants.LooseInt), - TemplateParameterType.Bool => GetPrimitiveType(schemaNode, t => t.Type == JTokenType.Boolean, LanguageConstants.TypeNameBool, LanguageConstants.LooseBool), - TemplateParameterType.Array => GetArrayType(schemaNode), - TemplateParameterType.Object => GetObjectType(schemaNode), - TemplateParameterType.SecureString => LanguageConstants.SecureString, - TemplateParameterType.SecureObject => GetObjectType(schemaNode, TypeSymbolValidationFlags.IsSecure), - _ => ErrorType.Empty(), - }; - } + if (resolved.Nullable?.Value == true) + { + bicepType = TypeHelper.CreateTypeUnion(bicepType, LanguageConstants.Null); + } - private TypeSymbol ResolveTypeReference(string reference) - { - if (!FollowRefsToConcreteTypeDefinition(reference, out var concreteType, out var errorBuilder)) + return bicepType; + } + catch (TemplateValidationException tve) { - return ErrorType.Create(errorBuilder(DiagnosticBuilder.ForDocumentStart())); + return ErrorType.Create(DiagnosticBuilder.ForDocumentStart().UnresolvableArmJsonType(tve.TemplateErrorAdditionalInfo.Path ?? "", tve.Message)); } - - return GetType(concreteType); } - private bool FollowRefsToConcreteTypeDefinition(string reference, [NotNullWhen(true)] out ITemplateSchemaNode? concreteType, [NotNullWhen(false)] out DiagnosticBuilder.ErrorBuilderDelegate? errorBuilder) - => FollowRefsUntil(new TemplateTypeDefinition { Ref = reference.ToTemplateGenericProperty() }, node => node.Type != null, out concreteType, out errorBuilder); - /// /// Metadata may be attached to $ref nodes, and the appropriate description for a given parameter or property will be the first one (if any) encountered while following $ref pointers to a concrete type. /// /// The starting point for the search /// - private string? GetMostSpecificDescription(ITemplateSchemaNode schemaNode) => FollowRefsUntil(schemaNode, - n => (GetMetadata(n) as JObject)?.ContainsKey(LanguageConstants.MetadataDescriptionPropertyName) == true, - out var nodeWithDescriptionOrEndOfRefTrail, - out _) - ? (GetMetadata(nodeWithDescriptionOrEndOfRefTrail) as JObject)?[LanguageConstants.MetadataDescriptionPropertyName]?.ToString() : null; - - private bool FollowRefsUntil( - ITemplateSchemaNode startingPoint, - Func shouldStopTraversing, - [NotNullWhen(true)] out ITemplateSchemaNode? cursorOnStop, - [NotNullWhen(false)] out DiagnosticBuilder.ErrorBuilderDelegate? errorBuilder) + private string? GetMostSpecificDescription(ITemplateSchemaNode schemaNode) { - ITemplateSchemaNode current = startingPoint; - LinkedList visited = new(); - - while (!shouldStopTraversing(current) && current.Ref?.Value is string @ref) + if (GetMetadata(schemaNode) is JObject metadataObject && + metadataObject.TryGetValue(LanguageConstants.MetadataDescriptionPropertyName, out var descriptionToken) && + descriptionToken is JValue { Value: string description }) { - if (visited.Contains(@ref)) - { - errorBuilder = b => b.CyclicArmTypeRefs(visited.Append(@ref)); - cursorOnStop = null; - return false; - } - visited.AddLast(@ref); - - - if (SourceFile.Template?.Definitions?.TryGetValue(@ref.Replace("#/definitions/", string.Empty), out var dereferenced) == true) - { - current = dereferenced; - continue; - } - - errorBuilder = b => b.ArmTypeRefTargetNotFound(@ref); - cursorOnStop = null; - return false; + return description; } - errorBuilder = null; - cursorOnStop = current; - return true; + return null; } - - private static JToken? GetMetadata(ITemplateSchemaNode schemaNode) => schemaNode switch + private JToken? GetMetadata(ITemplateSchemaNode schemaNode) { - TemplateInputParameter param => param.Metadata?.Value, - TemplateTypeDefinition type => type.Metadata?.Value, - _ => null, - }; + try + { + return TemplateEngine.ResolveSchemaReferences(SourceFile.Template, schemaNode).Metadata?.Value; + } + catch (TemplateValidationException) + { + return null; + } + } private static TypeSymbol GetPrimitiveType(ITemplateSchemaNode schemaNode, Func isValidLiteralPredicate, string typeName, TypeSymbol type) { @@ -276,17 +246,9 @@ private TypeSymbol GetArrayType(ITemplateSchemaNode schemaNode) List tupleMembers = new(); foreach (var prefixItem in prefixItems) { - if (prefixItem.Ref?.Value is { } @ref) - { - nameBuilder.AppendItem(@ref.Replace("#/definitions", "")); - tupleMembers.Add(new DeferredTypeReference(() => templateTypeDefinitions.GetOrAdd(@ref, ResolveTypeReference))); - } - else - { - var itemType = GetType(prefixItem); - nameBuilder.AppendItem(itemType.Name); - tupleMembers.Add(itemType); - } + var (type, typeName) = GetDeferrableTypeInfo(prefixItem); + nameBuilder.AppendItem(typeName); + tupleMembers.Add(type); } return new TupleType(nameBuilder.ToString(), tupleMembers.ToImmutableArray(), default); @@ -296,9 +258,8 @@ private TypeSymbol GetArrayType(ITemplateSchemaNode schemaNode) { if (items.Ref?.Value is { } @ref) { - return new TypedArrayType($"{@ref.Replace("#/definitions", "")}[]", - new DeferredTypeReference(() => templateTypeDefinitions.GetOrAdd(@ref, ResolveTypeReference)), - default); + var (type, typeName) = GetDeferrableTypeInfo(items); + return new TypedArrayType($"{typeName}[]", type, default); } return new TypedArrayType(GetType(items), default); @@ -346,7 +307,7 @@ private static TypeSymbol GetArrayLiteralType(JArray allowedValues) return new TypedArrayType(TypeHelper.CreateTypeUnion(elements), default); } - private TypeSymbol GetObjectType(ITemplateSchemaNode schemaNode, TypeSymbolValidationFlags symbolValidationFlags = TypeSymbolValidationFlags.Default) + private TypeSymbol GetObjectType(Template template, ITemplateSchemaNode schemaNode, TypeSymbolValidationFlags symbolValidationFlags = TypeSymbolValidationFlags.Default) { if (schemaNode.AllowedValues?.Value is JArray jArray) { @@ -362,22 +323,18 @@ private TypeSymbol GetObjectType(ITemplateSchemaNode schemaNode, TypeSymbolValid { foreach (var (propertyName, schema) in propertySchemata) { - var required = schemaNode.Required?.Value.Contains(propertyName) ?? false; + // depending on the language version, either only properties included in schemaNode.Required are required, + // or all of them are (but some may be nullable) + var required = template.GetLanguageVersion().HasFeature(TemplateLanguageFeature.NullableParameters) + ? true + : schemaNode.Required?.Value.Contains(propertyName) ?? false; var flags = required ? TypePropertyFlags.Required : TypePropertyFlags.None; var description = GetMostSpecificDescription(schema); - if (schema.Ref?.Value is { } @ref) - { - var type = new DeferredTypeReference(() => templateTypeDefinitions.GetOrAdd(@ref, ResolveTypeReference)); - properties.Add(new(propertyName, type, flags, description)); - nameBuilder.AppendProperty(propertyName, @ref.Replace("#/definitions", ""), isOptional: !required); - } - else - { - var type = GetType(schema); - properties.Add(new(propertyName, type, flags, description)); - nameBuilder.AppendProperty(propertyName, type.Name, isOptional: !required); - } + var (type, typeName) = GetDeferrableTypeInfo(schema); + + properties.Add(new(propertyName, type, flags, description)); + nameBuilder.AppendProperty(propertyName, typeName, isOptional: !required); } } @@ -387,9 +344,9 @@ private TypeSymbol GetObjectType(ITemplateSchemaNode schemaNode, TypeSymbolValid if (addlProps.SchemaNode is { } additionalPropertiesSchema) { - additionalPropertiesType = additionalPropertiesSchema.Ref?.Value is { } @ref - ? new DeferredTypeReference(() => templateTypeDefinitions.GetOrAdd(@ref, ResolveTypeReference)) - : GetType(additionalPropertiesSchema); + var typeInfo = GetDeferrableTypeInfo(additionalPropertiesSchema); + additionalPropertiesType = typeInfo.type; + nameBuilder.AppendPropertyMatcher("*", typeInfo.typeName); } else if (addlProps.BooleanValue == false) { @@ -397,7 +354,7 @@ private TypeSymbol GetObjectType(ITemplateSchemaNode schemaNode, TypeSymbolValid } } - if (properties.Count == 0 && additionalPropertiesType == LanguageConstants.Any && additionalPropertiesFlags == TypePropertyFlags.FallbackProperty) + if (properties.Count == 0 && schemaNode.AdditionalProperties is null) { return symbolValidationFlags.HasFlag(TypeSymbolValidationFlags.IsSecure) ? LanguageConstants.SecureObject : LanguageConstants.Object; } @@ -405,6 +362,12 @@ private TypeSymbol GetObjectType(ITemplateSchemaNode schemaNode, TypeSymbolValid return new ObjectType(nameBuilder.ToString(), symbolValidationFlags, properties, additionalPropertiesType, additionalPropertiesFlags); } + private (ITypeReference type, string typeName) GetDeferrableTypeInfo(ITemplateSchemaNode schemaNode) => schemaNode.Ref?.Value switch + { + string @ref => (new DeferredTypeReference(() => GetType(schemaNode)), @ref.Replace("#/definitions/", "")), + _ => GetType(schemaNode) switch { TypeSymbol concreteType => (concreteType, concreteType.Name) }, + }; + private static TypeSymbol GetType(TemplateOutputParameter output) { return output.Type.Value switch @@ -434,7 +397,7 @@ private static bool TryCreateUnboundResourceTypeParameter(JToken? metadataToken, metadata.TryGetValue(LanguageConstants.MetadataResourceTypePropertyName, out var obj) && obj.Value() is string resourceTypeRaw) { - if (ResourceTypeReference.TryParse(resourceTypeRaw) is {} parsed) + if (ResourceTypeReference.TryParse(resourceTypeRaw) is { } parsed) { type = new UnboundResourceType(parsed); return true; diff --git a/src/Bicep.Core/packages.lock.json b/src/Bicep.Core/packages.lock.json index a5b7bd3034b..80003e5570f 100644 --- a/src/Bicep.Core/packages.lock.json +++ b/src/Bicep.Core/packages.lock.json @@ -47,9 +47,9 @@ }, "Azure.Deployments.Core": { "type": "Direct", - "requested": "[1.0.788, )", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "requested": "[1.0.815, )", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -59,11 +59,11 @@ }, "Azure.Deployments.Expression": { "type": "Direct", - "requested": "[1.0.788, )", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "requested": "[1.0.815, )", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -75,12 +75,12 @@ }, "Azure.Deployments.Templates": { "type": "Direct", - "requested": "[1.0.788, )", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "requested": "[1.0.815, )", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, diff --git a/src/Bicep.Decompiler.IntegrationTests/packages.lock.json b/src/Bicep.Decompiler.IntegrationTests/packages.lock.json index d5e2f15b3b8..ab72f4e26ea 100644 --- a/src/Bicep.Decompiler.IntegrationTests/packages.lock.json +++ b/src/Bicep.Decompiler.IntegrationTests/packages.lock.json @@ -110,8 +110,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -121,20 +121,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -1984,9 +1984,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.Decompiler.UnitTests/packages.lock.json b/src/Bicep.Decompiler.UnitTests/packages.lock.json index d5e2f15b3b8..ab72f4e26ea 100644 --- a/src/Bicep.Decompiler.UnitTests/packages.lock.json +++ b/src/Bicep.Decompiler.UnitTests/packages.lock.json @@ -110,8 +110,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -121,20 +121,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -1984,9 +1984,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.Decompiler/packages.lock.json b/src/Bicep.Decompiler/packages.lock.json index e832013cf79..9bd239aa646 100644 --- a/src/Bicep.Decompiler/packages.lock.json +++ b/src/Bicep.Decompiler/packages.lock.json @@ -79,8 +79,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -90,20 +90,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -1703,9 +1703,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.LangServer.IntegrationTests/packages.lock.json b/src/Bicep.LangServer.IntegrationTests/packages.lock.json index 6a35474714f..4657a775208 100644 --- a/src/Bicep.LangServer.IntegrationTests/packages.lock.json +++ b/src/Bicep.LangServer.IntegrationTests/packages.lock.json @@ -144,8 +144,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -155,20 +155,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -1993,9 +1993,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.LangServer.UnitTests/packages.lock.json b/src/Bicep.LangServer.UnitTests/packages.lock.json index 8e94a44a300..d517fb818c2 100644 --- a/src/Bicep.LangServer.UnitTests/packages.lock.json +++ b/src/Bicep.LangServer.UnitTests/packages.lock.json @@ -131,8 +131,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -142,20 +142,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -1992,9 +1992,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.LangServer/packages.lock.json b/src/Bicep.LangServer/packages.lock.json index 2e282251dda..23d245f715b 100644 --- a/src/Bicep.LangServer/packages.lock.json +++ b/src/Bicep.LangServer/packages.lock.json @@ -103,8 +103,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -114,20 +114,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -1877,9 +1877,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.RegistryModuleTool.IntegrationTests/packages.lock.json b/src/Bicep.RegistryModuleTool.IntegrationTests/packages.lock.json index ca43db52011..5a54f84d3a7 100644 --- a/src/Bicep.RegistryModuleTool.IntegrationTests/packages.lock.json +++ b/src/Bicep.RegistryModuleTool.IntegrationTests/packages.lock.json @@ -110,8 +110,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -121,20 +121,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -2086,9 +2086,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.RegistryModuleTool.TestFixtures/packages.lock.json b/src/Bicep.RegistryModuleTool.TestFixtures/packages.lock.json index e2ed623d375..87ffd4040c2 100644 --- a/src/Bicep.RegistryModuleTool.TestFixtures/packages.lock.json +++ b/src/Bicep.RegistryModuleTool.TestFixtures/packages.lock.json @@ -109,8 +109,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -120,20 +120,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -2028,9 +2028,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.RegistryModuleTool.UnitTests/packages.lock.json b/src/Bicep.RegistryModuleTool.UnitTests/packages.lock.json index ca43db52011..5a54f84d3a7 100644 --- a/src/Bicep.RegistryModuleTool.UnitTests/packages.lock.json +++ b/src/Bicep.RegistryModuleTool.UnitTests/packages.lock.json @@ -110,8 +110,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -121,20 +121,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -2086,9 +2086,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.RegistryModuleTool/packages.lock.json b/src/Bicep.RegistryModuleTool/packages.lock.json index b6be1c68c01..d84a9b2ecad 100644 --- a/src/Bicep.RegistryModuleTool/packages.lock.json +++ b/src/Bicep.RegistryModuleTool/packages.lock.json @@ -210,8 +210,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -221,20 +221,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -2011,9 +2011,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.Tools.Benchmark/packages.lock.json b/src/Bicep.Tools.Benchmark/packages.lock.json index 6b1aab880ab..56ecc5da7e5 100644 --- a/src/Bicep.Tools.Benchmark/packages.lock.json +++ b/src/Bicep.Tools.Benchmark/packages.lock.json @@ -93,8 +93,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -104,20 +104,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -2070,9 +2070,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )", diff --git a/src/Bicep.Wasm/packages.lock.json b/src/Bicep.Wasm/packages.lock.json index a87cbb0a67d..a1363e53f9e 100644 --- a/src/Bicep.Wasm/packages.lock.json +++ b/src/Bicep.Wasm/packages.lock.json @@ -104,8 +104,8 @@ }, "Azure.Deployments.Core": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "7sK2ff4cDx9Ham/4DnbpZ2HL9cwnqEMsW8fWqM20dh9xoCTv8g2EGTw7MSMTHSJvqjJVSce+mEr6ldJfpfsDMA==", + "resolved": "1.0.815", + "contentHash": "vY5jCUjlm0xLGd/losAWT7w9NsL99WydtJ2ms5DmGcS6mmNmYdUedf4JiCHjTqU8OG+5niOi2BBTtLqTV7u4iw==", "dependencies": { "Microsoft.PowerPlatform.ResourceStack": "6.0.0.1423", "Newtonsoft.Json": "13.0.1", @@ -115,20 +115,20 @@ }, "Azure.Deployments.Expression": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "NWQygy/uUMYQB8JXP1CnorMs9J/zkszEk+nk3dAjAHDFjBbj8potaDyv1vq9E+KiUSvR5NFXHc1YVOvTBdLZ/Q==", + "resolved": "1.0.815", + "contentHash": "hZwwN96E02EKlm0u6zD53jr69nuJOdN3rTp/9ZjV6x+2OjW5ixofx17Z2pWU8qFmH82dy42PgYBysDhppw5GGA==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", + "Azure.Deployments.Core": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, "Azure.Deployments.Templates": { "type": "Transitive", - "resolved": "1.0.788", - "contentHash": "PuTc4Sq67xIi4Apu/v0CsIpzLBr43B+V231aLPlurCHJStir/BZGPPYDh+sXvpY/+zcMWn1j6A74Rv2Isrtr5A==", + "resolved": "1.0.815", + "contentHash": "c0d9o56MzPiTjGtAsXjOOnHh7FlVlb9BAMci9os1ET+mkkBRw0C0l6QlEzve/w62iHt9nD4hYD43YP4/g7gU0Q==", "dependencies": { - "Azure.Deployments.Core": "1.0.788", - "Azure.Deployments.Expression": "1.0.788", + "Azure.Deployments.Core": "1.0.815", + "Azure.Deployments.Expression": "1.0.815", "Newtonsoft.Json": "13.0.1" } }, @@ -1847,9 +1847,9 @@ "Azure.Bicep.Types.Az": "[0.2.238, )", "Azure.Bicep.Types.K8s": "[0.1.233, )", "Azure.Containers.ContainerRegistry": "[1.1.0-beta.4, )", - "Azure.Deployments.Core": "[1.0.788, )", - "Azure.Deployments.Expression": "[1.0.788, )", - "Azure.Deployments.Templates": "[1.0.788, )", + "Azure.Deployments.Core": "[1.0.815, )", + "Azure.Deployments.Expression": "[1.0.815, )", + "Azure.Deployments.Templates": "[1.0.815, )", "Azure.Identity": "[1.8.1, )", "Azure.ResourceManager.Resources": "[1.3.1, )", "JsonPatch.Net": "[2.0.4, )",