Skip to content

Commit 449684b

Browse files
Merge branch 'Azure:dev' into feature-apim-export-filename
2 parents a8c89e6 + 9a57ac3 commit 449684b

912 files changed

Lines changed: 710307 additions & 568229 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.devcontainer/init.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@ source .venv/bin/activate
44
# Logout default account
55
export GITHUB_TOKEN=
66

7-
# Check `repo` scope exists or not
8-
if gh auth status -a 2>/dev/null | grep "Token scopes: " | grep -q "repo"; then
9-
echo "You now have access to GitHub."
10-
else
11-
gh auth login -p https -w
7+
if [[ $- == *i* ]]; then # Interactive shell only
8+
# Check `repo` scope exists or not
9+
if gh auth status -a 2>/dev/null | grep "Token scopes: " | grep -q "repo"; then
10+
echo "You now have access to GitHub."
11+
else
12+
gh auth login -p https -w
13+
fi
1214
fi
1315

1416
# Check `aaz-dev` is available or not

.devcontainer/mcp.json

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,10 @@
11
{
2-
"inputs": [
3-
{
4-
"type": "promptString",
5-
"id": "extension_or_module_name",
6-
"description": "The name of the Azure CLI extension or module to generate commands for."
7-
},
8-
{
9-
"type": "promptString",
10-
"id": "swagger_module_path",
11-
"description": "The file path to the Swagger module."
12-
},
13-
{
14-
"type": "promptString",
15-
"id": "resource_provider",
16-
"description": "The Azure resource provider for which to generate commands."
17-
},
18-
{
19-
"type": "promptString",
20-
"id": "swagger_tag",
21-
"description": "The Swagger tag to use for command generation."
22-
}
23-
],
242
"servers": {
253
"AAZ Flow": {
264
"command": "python",
275
"args": [
28-
"azure-cli/tools/aaz-flow/main.py"
6+
"azure-cli/tools/aaz-flow/src/aaz-flow/main.py"
297
],
30-
"env": {
31-
"AAZ_PATH": "/workspaces/aaz",
32-
"CLI_PATH": "/workspaces/azure-cli",
33-
"CLI_EXTENSION_PATH": "/workspaces/azure-cli-extensions",
34-
"SWAGGER_PATH": "/workspaces/azure-rest-api-specs"
35-
}
368
}
379
}
38-
}
10+
}

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
/linter_exclusions.yml @jsntcy @kairu-ms @zhoxing-ms
88

9-
/doc/ @jiasli @kairu-ms @jsntcy
9+
/doc/ @jiasli @kairu-ms @jsntcy @necusjz @yanzhudd
1010
/tools/ @kairu-ms @jiasli @wangzelin007 @calvinhzy @bebound
1111
/tools/aaz-flow @a0x1ab @necusjz @yanzhudd
1212
/scripts/ @kairu-ms @jiasli @wangzelin007 @calvinhzy @bebound
@@ -24,7 +24,7 @@
2424
/src/azure-cli/azure/cli/command_modules/acs/ @zhoxing-ms @zqingqing1 @gtracer @xizhamsft @andyliuliming @fumingzhang @jsntcy @yanzhudd
2525
/src/azure-cli/azure/cli/command_modules/advisor/ @jsntcy @Prasanna-Padmanabhan
2626
/src/azure-cli/azure/cli/command_modules/apim/ @jsntcy @kevinhillinger @jonlester
27-
/src/azure-cli/azure/cli/command_modules/appconfig/ @zhoxing-ms @jsntcy @yanzhudd @ChristineWanjau @albertofori @avanigupta
27+
/src/azure-cli/azure/cli/command_modules/appconfig/ @zhoxing-ms @jsntcy @yanzhudd @ChristineWanjau @albertofori @avanigupta @mrm9084
2828
/src/azure-cli/azure/cli/command_modules/appservice/ @jsntcy @zhoxing-ms @yanzhudd @panchagnula
2929
/src/azure-cli/azure/cli/command_modules/aro/ @jsntcy @bennerv @hawkowl @jewzaam @rogbas
3030
/src/azure-cli/azure/cli/command_modules/backup/ @zhoxing-ms @jsntcy @yanzhudd @dragonfly91 @akshayneema

build_scripts/windows/scripts/build.cmd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ if "%ARCH%"=="x86" (
3030
echo Please set ARCH to "x86" or "x64"
3131
goto ERROR
3232
)
33-
set PYTHON_VERSION=3.13.7
33+
set PYTHON_VERSION=3.13.9
3434

3535
set WIX_DOWNLOAD_URL="https://azurecliprod.blob.core.windows.net/msi/wix310-binaries-mirror.zip"
3636
set PYTHON_DOWNLOAD_URL="https://www.python.org/ftp/python/%PYTHON_VERSION%/python-%PYTHON_VERSION%-embed-%PYTHON_ARCH%.zip"

doc/assets/codespace_copilot.png

65.2 KB
Loading

doc/assets/codespace_entry.png

230 KB
Loading

doc/assets/codespace_logged.png

31.6 KB
Loading

doc/assets/codespace_login.png

48.6 KB
Loading

0 commit comments

Comments
 (0)