Skip to content

fix: Down merge with main to dev3#722

Closed
AjitPadhi-Microsoft wants to merge 50 commits into
dev-v3from
rebase_main
Closed

fix: Down merge with main to dev3#722
AjitPadhi-Microsoft wants to merge 50 commits into
dev-v3from
rebase_main

Conversation

@AjitPadhi-Microsoft

@AjitPadhi-Microsoft AjitPadhi-Microsoft commented Dec 16, 2025

Copy link
Copy Markdown
Contributor

Purpose

  • ...

Does this introduce a breaking change?

  • Yes
  • No

How to Test

  • Get the code
git clone [repo-address]
cd [repo-name]
git checkout [branch-name]
npm install
  • Test the code

What to Check

Verify that the following are valid

  • ...

Other Information

NirajC-Microsoft and others added 30 commits September 22, 2025 16:00
@NirajC-Microsoft
Remove Createdby Parameter from deploy.yml and change logic in bicep
ed09467
@NirajC-Microsoft
Update deploy.yml to include createdBy parameter
c6962b5
@VishalS-Microsoft
CI Pipeline Validate Deployment - MACAE
83a661e
@VishalS-Microsoft
removed my feature branch
fd0ca46
@NirajC-Microsoft
Add createdBy parameter with description
28a6e0b
@Roopan-Microsoft
Merge pull request #520 from microsoft/psl-removecreatetagfrompipeline
cb448da 
fix: Remove Createdby Parameter from deploy.yml and change logic in bicep
@VishalS-Microsoft
added new 'type' tag
f602851
@Roopan-Microsoft
Merge pull request #523 from microsoft/CI-Pipeline-macae
e7f78a9 
fix: CI Pipeline Validate Deployment - MACAE
@Vamshi-Microsoft
Updated README, azure.yml for minimum azd version 1.18.0
a64e5c6
@Prajwal-Microsoft
Merge pull request #538 from microsoft/psl-azd-version-update
9651a5a 
docs: Updated README, azure.yml for minimum azd version 1.18.0
@Prekshith-Microsoft
update the network module
7ebc4dc
@Prekshith-Microsoft
updated
0579bc6
@Prekshith-Microsoft
Removed commented code
4b7993f
@Prekshith-Microsoft
Removed administration subnet
489ff8d
@Prekshith-Microsoft
Added admin and removed jumpbox
d023557
@Prajwal-Microsoft
Merge pull request #563 from microsoft/psl-macae-networkmodule
4fcb021 
fix: optimize the network module for Macae
@NirajC-Microsoft
Add AZURE_DEV_COLLECT_TELEMETRY variable in azure-dev.yml file for ma…
e488b28 
…cae-v2
@Roopan-Microsoft
Merge pull request #567 from microsoft/psl-macae2-azuredev
862b23f 
chore: Add AZURE_DEV_COLLECT_TELEMETRY variable in azure-dev.yml file for MACAE-v2
@Ritesh-Microsoft
macae-v3-gp
6133fff
@Avijit-Microsoft
test: MACAE-v3-Golden path Script
f4fc534
@Ritesh-Microsoft
Revert "test: MACAE-v3-Golden path Script"
3a6e6d8
@Roopan-Microsoft
Merge pull request #589 from microsoft/revert-585-dev
6203a74 
fix: [Revert] MACAE-v3-Golden path Script
@Abdul-Microsoft
docs: add guidance for disabling Log Analytics workspace replication …
965e3c7 
…before deletion
@Roopan-Microsoft
Merge pull request #668 from microsoft/dev-v3
1f3b76a 
fix: Merging dev changes to main branch
@Harsh-Microsoft
Update deployment guide and quota check documentation for VS Code Web…
532f7b3 
… usage
@Avijit-Microsoft
docs: update deployment guide and quota check documentation for VS Co…
d755e02 
…de Web usage
Initial plan
5ace6e9
@Prekshith-Microsoft
Add dgp10801 to CODEOWNERS file
1bc0ec7 
Co-authored-by: Prekshith-Microsoft <216912978+Prekshith-Microsoft@users.noreply.github.com>
@Prajwal-Microsoft
Merge pull request #673 from microsoft/copilot/add-dgp10801-to-codeow…
ce6df3e 
…ners

chore: Add dgp10801 to CODEOWNERS
fix portal link
0ab669e
Ritesh-Microsoft and others added 14 commits December 8, 2025 14:06
@Ritesh-Microsoft
macae-st
b9860d7
@Vamshi-Microsoft
fix: fixed Image Tag
fca202b
@Prajwal-Microsoft
Merge pull request #692 from microsoft/pls-deploymentPipelineImageTag
c33e5de 
fix: fixed Image Tag
@Vamshi-Microsoft
Merge branch 'main' into smoketesting-pipeline-integration
fb96331
@Vamshi-Microsoft
Added Smoke Testing Cases
0330728
@Vamshi-Microsoft
Changed Always to !cancelled
44342f2
@Vamshi-Microsoft
Minor changes in email subject and body for Existing Url
9d6b3c4
@Shreyas-Microsoft
Document known issues with Azure Container Apps
4ffe00d 
Added a section on known issues with Azure Container Apps, detailing problems with updating environment variables and container configurations, along with workarounds using Azure CLI.
@Prajwal-Microsoft
Merge pull request #697 from microsoft/smoketesting-pipeline-integration
6de27df 
feat: Integrate smoke testing into the pipeline
@Shreyas-Microsoft
Revise known issues for Azure Container Apps
bb91916 
Updated known issues section with workarounds for Azure Container App environment variable management.
@Shreyas-Microsoft
Update docs/DeploymentGuide.md
19b9959 
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
@Roopan-Microsoft
Merge pull request #707 from microsoft/psl-add-known-issues
a9a0557 
docs: Document known issues with Azure Container Apps
@Roopan-Microsoft
Merge pull request #714 from microsoft/dev-v3
01a74aa 
chore: merge dev into main
@AjitPadhi-Microsoft
Merge branch 'dev' into rebase_main
0168b69
@AjitPadhi-Microsoft AjitPadhi-Microsoft changed the base branch from dev to dev-v3 December 16, 2025 13:57
@AjitPadhi-Microsoft
Add timestamp generation in deploy-waf.yml
bdddd7d 
Add timestamp generation to deployment script.
@AjitPadhi-Microsoft
Clean up blank lines in deploy-waf.yml
d0b8386 
Removed unnecessary blank lines in deployment script.
@AjitPadhi-Microsoft AjitPadhi-Microsoft marked this pull request as ready for review December 16, 2025 14:00
@AjitPadhi-Microsoft AjitPadhi-Microsoft changed the title fix: Down merge with main fix: Down merge with main to dev3 Dec 16, 2025
@AjitPadhi-Microsoft AjitPadhi-Microsoft deleted the rebase_main branch December 16, 2025 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@Avijit-Microsoft Avijit-Microsoft Awaiting requested review from Avijit-Microsoft Avijit-Microsoft is a code owner

@Roopan-Microsoft Roopan-Microsoft Awaiting requested review from Roopan-Microsoft Roopan-Microsoft is a code owner

@Prajwal-Microsoft Prajwal-Microsoft Awaiting requested review from Prajwal-Microsoft

@marktayl1 marktayl1 Awaiting requested review from marktayl1 marktayl1 is a code owner

@Fr4nc3 Fr4nc3 Awaiting requested review from Fr4nc3 Fr4nc3 is a code owner

@Vinay-Microsoft Vinay-Microsoft Awaiting requested review from Vinay-Microsoft

@aniaroramsft aniaroramsft Awaiting requested review from aniaroramsft aniaroramsft is a code owner

@toherman-msft toherman-msft Awaiting requested review from toherman-msft toherman-msft is a code owner

@nchandhi nchandhi Awaiting requested review from nchandhi nchandhi is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.