diff --git a/src/Resources/ResourceManager/Utilities/BicepUtility.cs b/src/Resources/ResourceManager/Utilities/BicepUtility.cs index 56584822eeff..59119666f5e0 100644 --- a/src/Resources/ResourceManager/Utilities/BicepUtility.cs +++ b/src/Resources/ResourceManager/Utilities/BicepUtility.cs @@ -62,6 +62,8 @@ public static BicepUtility Create() private const string MinimalVersionRequirementForBicepparamFileBuildWithInlineOverrides = "0.22.6"; + private const string MinimalVersionRequirementForBicepPublishWithNewDocumentationUriParameter = "0.24.24"; + public delegate void OutputCallback(string msg); private readonly IProcessInvoker processInvoker; @@ -153,7 +155,12 @@ public void PublishFile(string bicepFilePath, string target, string documentatio if (!string.IsNullOrWhiteSpace(documentationUri)) { CheckMinimalVersionRequirement(MinimalVersionRequirementForBicepPublishWithOptionalDocumentationUriParameter); - bicepPublishCommand += $" --documentationUri {GetQuotedFilePath(documentationUri)}"; + + if (IsBicepMinimalVersion(MinimalVersionRequirementForBicepPublishWithNewDocumentationUriParameter)) { + bicepPublishCommand += $" --documentation-uri {GetQuotedFilePath(documentationUri)}"; + } else { + bicepPublishCommand += $" --documentationUri {GetQuotedFilePath(documentationUri)}"; + } } if (withSource) @@ -196,6 +203,9 @@ private string CheckMinimalVersionRequirement(string minimalVersionRequirement) return BicepVersion; } + private bool IsBicepMinimalVersion(string minimalVersionRequirement) => + Version.Parse(minimalVersionRequirement).CompareTo(Version.Parse(BicepVersion)) > 0; + /// /// Runs a bicep command, and returns stdout as a string. /// @@ -225,4 +235,4 @@ private string RunBicepCommand(string arguments, string minimalVersionRequiremen private static string GetQuotedFilePath(string filePath) => $"\"{filePath.Replace("\"", "\\\"")}\""; } -} \ No newline at end of file +} diff --git a/src/Resources/Resources/ChangeLog.md b/src/Resources/Resources/ChangeLog.md index ea7261e2615a..db5190162d39 100644 --- a/src/Resources/Resources/ChangeLog.md +++ b/src/Resources/Resources/ChangeLog.md @@ -19,6 +19,7 @@ --> ## Upcoming Release +* Updated to use bicep parameter --documentation-uri instead of the deprecated --documentationUri * Upgraded nuget package to signed package. * Added DefaultApiVersion to the returned properties of the `Get-AzResourceProvider` cmdlet's Resource Type array * Added Diagnostics/Warnings to WhatIf/Validate results for deployments.