fix: merging dev to main #2126
Merged
Roopan-Microsoft merged 204 commits intomainfrom Apr 6, 2026
Merged
Conversation
Co-authored-by: Roopan P M <[email protected]>
Co-authored-by: Roopan P M <[email protected]>
Co-authored-by: Ajit Padhi <[email protected]>
Co-authored-by: Roopan-Microsoft <[email protected]>
Co-authored-by: Roopan-Microsoft <[email protected]>
Co-authored-by: Roopan-Microsoft <[email protected]> Co-authored-by: Ross Smith <[email protected]> Co-authored-by: gpickett <[email protected]> Co-authored-by: Francia Riesco <[email protected]> Co-authored-by: Francia Riesco <[email protected]> Co-authored-by: Prajwal D C <[email protected]>
…nd Update Conversation flow based on template selection (#1567) Co-authored-by: Pavan Kumar <v-kupavan.microsoft.com>
Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Pavan-Microsoft <[email protected]>
Prajwal-Microsoft
approved these changes
Mar 30, 2026
Prajwal-Microsoft
approved these changes
Mar 30, 2026
Avijit-Microsoft
approved these changes
Apr 6, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose
Jumpbox VM Size Default Update
Changed the default jumpbox VM size from
Standard_DS2_v2toStandard_D2s_v5ininfra/main.bicep, the generatedinfra/main.json, and all related module parameter usages and documentation references. This ensures that deployments use a more current and widely available VM size by default. [1] [2] [3] [4] [5] [6]Updated troubleshooting documentation for the
SkuNotAvailableerror to reference the new default VM size, provide guidance on checking availability, and recommend alternatives if the default is unavailable in a region.Conditional Resource Deployment
databaseTypeisCosmosDB, both ininfra/main.bicepand the generatedinfra/main.json. This avoids unnecessary resource creation. [1] [2]Template and Tooling Updates
infra/main.jsonwith Bicep version0.41.2.15936(was0.40.2.10011), updating all associated template hashes and metadata throughout the file. This brings the infrastructure code up to date with the latest tooling. [1] [2] [3] [4] [5] [6] [7] [8] [9] [10] [11] [12] [13] [14] [15] [16] [17]Does this introduce a breaking change?
How to Test
What to Check
Verify that the following are valid
Other Information