Skip to content

Commit 876ca26

Browse files
SimonWahlinYanaXu
andauthored
[Az.Resources] Update BicepUtility.cs (Azure#26782)
* Update BicepUtility.cs Parameter --documentationUri is deprecated, please use --documentation-uri instead. * Update ChangeLog.md * Add check for bicep version 0.24.24 before using new --documentation-uri parameter --------- Co-authored-by: Yan Xu <[email protected]>
1 parent dd82de4 commit 876ca26

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

src/Resources/ResourceManager/Utilities/BicepUtility.cs

+12-2
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ public static BicepUtility Create()
6262

6363
private const string MinimalVersionRequirementForBicepparamFileBuildWithInlineOverrides = "0.22.6";
6464

65+
private const string MinimalVersionRequirementForBicepPublishWithNewDocumentationUriParameter = "0.24.24";
66+
6567
public delegate void OutputCallback(string msg);
6668

6769
private readonly IProcessInvoker processInvoker;
@@ -153,7 +155,12 @@ public void PublishFile(string bicepFilePath, string target, string documentatio
153155
if (!string.IsNullOrWhiteSpace(documentationUri))
154156
{
155157
CheckMinimalVersionRequirement(MinimalVersionRequirementForBicepPublishWithOptionalDocumentationUriParameter);
156-
bicepPublishCommand += $" --documentationUri {GetQuotedFilePath(documentationUri)}";
158+
159+
if (IsBicepMinimalVersion(MinimalVersionRequirementForBicepPublishWithNewDocumentationUriParameter)) {
160+
bicepPublishCommand += $" --documentation-uri {GetQuotedFilePath(documentationUri)}";
161+
} else {
162+
bicepPublishCommand += $" --documentationUri {GetQuotedFilePath(documentationUri)}";
163+
}
157164
}
158165

159166
if (withSource)
@@ -196,6 +203,9 @@ private string CheckMinimalVersionRequirement(string minimalVersionRequirement)
196203
return BicepVersion;
197204
}
198205

206+
private bool IsBicepMinimalVersion(string minimalVersionRequirement) =>
207+
Version.Parse(minimalVersionRequirement).CompareTo(Version.Parse(BicepVersion)) > 0;
208+
199209
/// <summary>
200210
/// Runs a bicep command, and returns stdout as a string.
201211
/// </summary>
@@ -225,4 +235,4 @@ private string RunBicepCommand(string arguments, string minimalVersionRequiremen
225235
private static string GetQuotedFilePath(string filePath)
226236
=> $"\"{filePath.Replace("\"", "\\\"")}\"";
227237
}
228-
}
238+
}

src/Resources/Resources/ChangeLog.md

+1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
-->
2020

2121
## Upcoming Release
22+
* Updated to use bicep parameter --documentation-uri instead of the deprecated --documentationUri
2223
* Upgraded nuget package to signed package.
2324
* Added DefaultApiVersion to the returned properties of the `Get-AzResourceProvider` cmdlet's Resource Type array
2425
* Added Diagnostics/Warnings to WhatIf/Validate results for deployments.

0 commit comments

Comments
 (0)