Skip to content
Draft
Show file tree
Hide file tree
Changes from 5 commits
Commits
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
6 changes: 3 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@
<PackageVersion Include="Microsoft.Extensions.Azure" Version="1.13.0" />
<PackageVersion Include="Microsoft.Extensions.Configuration.AzureAppConfiguration" Version="8.4.0" />
<!-- Azure Management SDK for .NET dependencies -->
<PackageVersion Include="Azure.Provisioning" Version="1.3.0" />
<PackageVersion Include="Azure.Provisioning" Version="1.4.0-beta.3" />
<PackageVersion Include="Azure.Provisioning.AppConfiguration" Version="1.1.0" />
<PackageVersion Include="Azure.Provisioning.AppContainers" Version="1.1.0" />
<PackageVersion Include="Azure.Provisioning.AppService" Version="1.2.0" />
<PackageVersion Include="Azure.Provisioning.AppService" Version="1.3.0-beta.1" />
<PackageVersion Include="Azure.Provisioning.ApplicationInsights" Version="1.1.0" />
<PackageVersion Include="Azure.Provisioning.ContainerRegistry" Version="1.1.0" />
<PackageVersion Include="Azure.Provisioning.CognitiveServices" Version="1.1.0" />
Expand Down Expand Up @@ -164,7 +164,7 @@
<!-- playground apps dependencies for javascript -->
<PackageVersion Include="Swashbuckle.AspNetCore" Version="9.0.6" />
<!-- Pinned versions for Component Governance - Remove when root dependencies are updated -->
<PackageVersion Include="Azure.Core" Version="1.49.0" />
<PackageVersion Include="Azure.Core" Version="1.50.0" />
<PackageVersion Include="Azure.Identity" Version="1.17.0" />
<!-- https://github.com/Azure/azure-cosmos-dotnet-v3/pull/3313 -->
<PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@
"NetworkTimeout": {
"type": "string",
"pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$",
"description": "The timeout applied to an individual network operations."
"description": "The timeout applied to individual network operations."
}
},
"description": "Gets the client retry options."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"NetworkTimeout": {
"type": "string",
"pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$",
"description": "The timeout applied to an individual network operations."
"description": "The timeout applied to individual network operations."
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

}
},
"description": "Gets the client retry options."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"NetworkTimeout": {
"type": "string",
"pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$",
"description": "The timeout applied to an individual network operations."
"description": "The timeout applied to individual network operations."
}
},
"description": "Gets the client retry options."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
"NetworkTimeout": {
"type": "string",
"pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$",
"description": "The timeout applied to an individual network operations."
"description": "The timeout applied to individual network operations."
}
},
"description": "Gets the client retry options."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
"NetworkTimeout": {
"type": "string",
"pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$",
"description": "The timeout applied to an individual network operations."
"description": "The timeout applied to individual network operations."
}
},
"description": "Gets the client retry options."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
"NetworkTimeout": {
"type": "string",
"pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$",
"description": "The timeout applied to an individual network operations."
"description": "The timeout applied to individual network operations."
}
},
"description": "Gets the client retry options."
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"NetworkTimeout": {
"type": "string",
"pattern": "^-?(\\d{1,7}|((\\d{1,7}[\\.:])?(([01]?\\d|2[0-3]):[0-5]?\\d|([01]?\\d|2[0-3]):[0-5]?\\d:[0-5]?\\d)(\\.\\d{1,7})?))$",
"description": "The timeout applied to an individual network operations."
"description": "The timeout applied to individual network operations."
}
},
"description": "Gets the client retry options."
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
@description('The location for the resource(s) to be deployed.')
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

param existing_appenv_name string

param existing_appenv_rg string

resource test_app_service_env 'Microsoft.Web/serverfarms@2024-11-01' existing = {
resource test_app_service_env 'Microsoft.Web/serverfarms@2025-03-01' existing = {
name: existing_appenv_name
scope: resourceGroup(existing_appenv_rg)
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@description('The location for the resource(s) to be deployed.')
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

param env_outputs_azure_container_registry_endpoint string
Expand All @@ -17,7 +17,7 @@ param env_outputs_azure_website_contributor_managed_identity_id string

param env_outputs_azure_website_contributor_managed_identity_principal_id string

resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = {
resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = {
name: 'main'
properties: {
authType: 'UserAssigned'
Expand All @@ -29,7 +29,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = {
parent: webapp
}

resource webapp 'Microsoft.Web/sites@2024-11-01' = {
resource webapp 'Microsoft.Web/sites@2025-03-01' = {
name: take('${toLower('container1')}-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down Expand Up @@ -91,4 +91,4 @@ resource container1_website_ra 'Microsoft.Authorization/roleAssignments@2022-04-
principalType: 'ServicePrincipal'
}
scope: webapp
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ resource env_acr_env_mi_AcrPull 'Microsoft.Authorization/roleAssignments@2022-04
scope: env_acr
}

resource env_asplan 'Microsoft.Web/serverfarms@2024-11-01' = {
resource env_asplan 'Microsoft.Web/serverfarms@2025-03-01' = {
name: take('envasplan-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down Expand Up @@ -58,4 +58,4 @@ output AZURE_CONTAINER_REGISTRY_ENDPOINT string = env_acr.properties.loginServer

output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_ID string = env_mi.id

output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_CLIENT_ID string = env_mi.properties.clientId
output AZURE_CONTAINER_REGISTRY_MANAGED_IDENTITY_CLIENT_ID string = env_mi.properties.clientId
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@description('The location for the resource(s) to be deployed.')
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

param env_outputs_azure_container_registry_endpoint string
Expand All @@ -23,7 +23,7 @@ param env_outputs_azure_application_insights_instrumentationkey string

param env_outputs_azure_application_insights_connection_string string

resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = {
resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = {
name: 'main'
properties: {
authType: 'UserAssigned'
Expand All @@ -35,7 +35,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = {
parent: webapp
}

resource webapp 'Microsoft.Web/sites@2024-11-01' = {
resource webapp 'Microsoft.Web/sites@2025-03-01' = {
name: take('${toLower('project1')}-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down Expand Up @@ -129,4 +129,4 @@ resource project1_website_ra 'Microsoft.Authorization/roleAssignments@2022-04-01
principalType: 'ServicePrincipal'
}
scope: webapp
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@description('The location for the resource(s) to be deployed.')
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

param env_outputs_azure_container_registry_endpoint string
Expand All @@ -19,7 +19,7 @@ param env_outputs_azure_website_contributor_managed_identity_id string

param env_outputs_azure_website_contributor_managed_identity_principal_id string

resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = {
resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = {
name: 'main'
properties: {
authType: 'UserAssigned'
Expand All @@ -31,7 +31,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = {
parent: webapp
}

resource webapp 'Microsoft.Web/sites@2024-11-01' = {
resource webapp 'Microsoft.Web/sites@2025-03-01' = {
name: take('${toLower('project1')}-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down Expand Up @@ -113,4 +113,4 @@ resource project1_website_ra 'Microsoft.Authorization/roleAssignments@2022-04-01
principalType: 'ServicePrincipal'
}
scope: webapp
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@description('The location for the resource(s) to be deployed.')
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

param userPrincipalId string = ''
Expand Down Expand Up @@ -30,7 +30,7 @@ resource env_acr_env_mi_AcrPull 'Microsoft.Authorization/roleAssignments@2022-04
scope: env_acr
}

resource env_asplan 'Microsoft.Web/serverfarms@2024-11-01' = {
resource env_asplan 'Microsoft.Web/serverfarms@2025-03-01' = {
name: take('envasplan-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down Expand Up @@ -60,7 +60,7 @@ resource env_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
}
}

resource dashboard 'Microsoft.Web/sites@2024-11-01' = {
resource dashboard 'Microsoft.Web/sites@2025-03-01' = {
name: take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down Expand Up @@ -146,4 +146,4 @@ output AZURE_WEBSITE_CONTRIBUTOR_MANAGED_IDENTITY_ID string = env_contributor_mi

output AZURE_WEBSITE_CONTRIBUTOR_MANAGED_IDENTITY_PRINCIPAL_ID string = env_contributor_mi.properties.principalId

output AZURE_APP_SERVICE_DASHBOARD_URI string = 'https://${take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60)}.azurewebsites.net'
output AZURE_APP_SERVICE_DASHBOARD_URI string = 'https://${take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60)}.azurewebsites.net'
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ param project2_containerimage string

param project2_containerport string

resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = {
resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = {
name: 'main'
properties: {
authType: 'UserAssigned'
Expand All @@ -25,7 +25,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = {
parent: webapp
}

resource webapp 'Microsoft.Web/sites@2024-11-01' = {
resource webapp 'Microsoft.Web/sites@2025-03-01' = {
name: take('${toLower('project2')}-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ resource env_acr_env_mi_AcrPull 'Microsoft.Authorization/roleAssignments@2022-04
scope: env_acr
}

resource env_asplan 'Microsoft.Web/serverfarms@2024-11-01' = {
resource env_asplan 'Microsoft.Web/serverfarms@2025-03-01' = {
name: take('envasplan-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down Expand Up @@ -60,7 +60,7 @@ resource env_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
}
}

resource dashboard 'Microsoft.Web/sites@2024-11-01' = {
resource dashboard 'Microsoft.Web/sites@2025-03-01' = {
name: take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down Expand Up @@ -171,4 +171,4 @@ output AZURE_APP_SERVICE_DASHBOARD_URI string = 'https://${take('${toLower('env'

output AZURE_APPLICATION_INSIGHTS_INSTRUMENTATIONKEY string = env_ai.properties.InstrumentationKey

output AZURE_APPLICATION_INSIGHTS_CONNECTION_STRING string = env_ai.properties.ConnectionString
output AZURE_APPLICATION_INSIGHTS_CONNECTION_STRING string = env_ai.properties.ConnectionString
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ resource env_acr_env_mi_AcrPull 'Microsoft.Authorization/roleAssignments@2022-04
scope: env_acr
}

resource env_asplan 'Microsoft.Web/serverfarms@2024-11-01' = {
resource env_asplan 'Microsoft.Web/serverfarms@2025-03-01' = {
name: take('envasplan-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down Expand Up @@ -60,7 +60,7 @@ resource env_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
}
}

resource dashboard 'Microsoft.Web/sites@2024-11-01' = {
resource dashboard 'Microsoft.Web/sites@2025-03-01' = {
name: take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ resource env_acr_env_mi_AcrPull 'Microsoft.Authorization/roleAssignments@2022-04
scope: env_acr
}

resource env_asplan 'Microsoft.Web/serverfarms@2024-11-01' = {
resource env_asplan 'Microsoft.Web/serverfarms@2025-03-01' = {
name: take('envasplan-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down Expand Up @@ -62,7 +62,7 @@ resource env_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
}
}

resource dashboard 'Microsoft.Web/sites@2024-11-01' = {
resource dashboard 'Microsoft.Web/sites@2025-03-01' = {
name: take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@description('The location for the resource(s) to be deployed.')
@description('The location for the resource(s) to be deployed.')
param location string = resourceGroup().location

param env_outputs_azure_container_registry_endpoint string
Expand All @@ -19,7 +19,7 @@ param env_outputs_azure_website_contributor_managed_identity_id string

param env_outputs_azure_website_contributor_managed_identity_principal_id string

resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = {
resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = {
name: 'main'
properties: {
authType: 'UserAssigned'
Expand All @@ -35,7 +35,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = {
parent: webapp
}

resource webapp 'Microsoft.Web/sites@2024-11-01' = {
resource webapp 'Microsoft.Web/sites@2025-03-01' = {
name: take('${toLower('project2')}-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down Expand Up @@ -125,4 +125,4 @@ resource project2_website_ra 'Microsoft.Authorization/roleAssignments@2022-04-01
principalType: 'ServicePrincipal'
}
scope: webapp
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ resource env_acr_env_mi_AcrPull 'Microsoft.Authorization/roleAssignments@2022-04
scope: env_acr
}

resource env_asplan 'Microsoft.Web/serverfarms@2024-11-01' = {
resource env_asplan 'Microsoft.Web/serverfarms@2025-03-01' = {
name: take('envasplan-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down Expand Up @@ -62,7 +62,7 @@ resource env_ra 'Microsoft.Authorization/roleAssignments@2022-04-01' = {
}
}

resource dashboard 'Microsoft.Web/sites@2024-11-01' = {
resource dashboard 'Microsoft.Web/sites@2025-03-01' = {
name: take('${toLower('env')}-${toLower('aspiredashboard')}-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down Expand Up @@ -156,4 +156,4 @@ output AZURE_APP_SERVICE_DASHBOARD_URI string = 'https://${take('${toLower('env'

output AZURE_APPLICATION_INSIGHTS_INSTRUMENTATIONKEY string = existingAppInsights.properties.InstrumentationKey

output AZURE_APPLICATION_INSIGHTS_CONNECTION_STRING string = existingAppInsights.properties.ConnectionString
output AZURE_APPLICATION_INSIGHTS_CONNECTION_STRING string = existingAppInsights.properties.ConnectionString
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ param env_outputs_azure_website_contributor_managed_identity_id string

param env_outputs_azure_website_contributor_managed_identity_principal_id string

resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = {
resource mainContainer 'Microsoft.Web/sites/sitecontainers@2025-03-01' = {
name: 'main'
properties: {
authType: 'UserAssigned'
Expand All @@ -29,7 +29,7 @@ resource mainContainer 'Microsoft.Web/sites/sitecontainers@2024-11-01' = {
parent: webapp
}

resource webapp 'Microsoft.Web/sites@2024-11-01' = {
resource webapp 'Microsoft.Web/sites@2025-03-01' = {
name: take('${toLower('project2')}-${uniqueString(resourceGroup().id)}', 60)
location: location
properties: {
Expand Down
Loading