Skip to content

fix: main to dev downmerge #722

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Ragini-Microsoft wants to merge 3 commits into from
Closed

fix: main to dev downmerge #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bbe71b
Merge pull request #710 from microsoft/dev
Avijit-Microsoft Feb 17, 2026
4eac702
added allowed regions for ai service location
Ragini-Microsoft Feb 19, 2026
f098dfb
Merge pull request #717 from microsoft/rc-bicepfixmain
Ragini-Microsoft Feb 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions content-gen/infra/main.bicep
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,20 @@ param secondaryLocation string = 'uksouth'

// NOTE: Metadata must be compile-time constants. Update usageName manually if you change model parameters.
// Format: 'OpenAI.<DeploymentType>.<ModelName>,<Capacity>'
// Allowed regions: Union of GPT-5.1, gpt-image-1, and gpt-image-1.5 GlobalStandard availability
@allowed([
'australiaeast'
'canadaeast'
'eastus2'
'japaneast'
'koreacentral'
'polandcentral'
'swedencentral'
'switzerlandnorth'
'uaenorth'
'uksouth'
'westus3'
])
@metadata({
azd: {
type: 'location'
Expand Down
17 changes: 15 additions & 2 deletions content-gen/infra/main.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"_generator": {
"name": "bicep",
"version": "0.40.2.10011",
"templateHash": "8403017938611050215"
"templateHash": "14662930066054172114"
},
"name": "Intelligent Content Generation Accelerator",
"description": "Solution Accelerator for multimodal marketing content generation using Microsoft Agent Framework.\n"
Expand Down Expand Up @@ -62,6 +62,19 @@
},
"azureAiServiceLocation": {
"type": "string",
"allowedValues": [
"australiaeast",
"canadaeast",
"eastus2",
"japaneast",
"koreacentral",
"polandcentral",
"swedencentral",
"switzerlandnorth",
"uaenorth",
"uksouth",
"westus3"
],
"metadata": {
"azd": {
"type": "location",
Expand Down Expand Up @@ -14019,8 +14032,8 @@
},
"dependsOn": [
"aiFoundryAiServices",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').cognitiveServices)]",
"[format('avmPrivateDnsZones[{0}]', variables('dnsZoneIndex').openAI)]",
"virtualNetwork"
]
},
Expand Down