Merge branch 'dev/4.6.2-win-ci' into dev/4.5.3

Author: HeZhengQing

.github/ci/build/build_windows.bat

@@ -10,8 +10,6 @@ REM 'repo:string',
 REM 'base:string',
 REM 'arch:string'
 REM 'output:string'
-REM 'short_version:string'
-REM 'release_version:string'
 REM 'build_date:string(yyyyMMdd)',
 REM 'build_timestamp:string (yyyyMMdd_hhmm)',
 REM 'platform: string',
@@ -46,54 +44,68 @@ echo source_root: %source_root%
 echo output: C:\\tmp\\%project%_out
 echo build_date: %build_date%
 echo build_time: %build_time%
-echo release_version: %release_version%
-echo short_version: %short_version%
 echo pwd: %cd%
 echo sdk_url: %sdk_url%
 
-
-set zip_name=Agora_Native_SDK_for_Windows_FULL_DEFAULT.zip
-if %compile_project% EQU false goto SKIP_DOWNLOAD
-set zip_name=%sdk_url%
-:LOOP
-for /f "tokens=1* delims=</>" %%a in ("%zip_name%") do (
-    set zip_name=%%a
-    set part2=%%b
+REM If sdk_url has a value, replace the URL in install.ps1
+if not "%sdk_url%"=="" (
+    if not "%sdk_url%"=="none" (
+        echo "Replacing SDK URL in install.ps1"
+        powershell -Command "(Get-Content windows\APIExample\install.ps1) -replace '\$agora_sdk = ''.*''', ('$agora_sdk = ''' + '%sdk_url%' + '''') | Set-Content windows\APIExample\install.ps1"
+    )
 )
-if "%part2%" EQU "" goto END
-set zip_name=%part2%
-goto LOOP
-:END
-echo on
-echo zip_name: %zip_name%
-
-dir
 
-curl %sdk_url% -o %zip_name%
-REM python %WORKSPACE%\\artifactory_utils.py --action=download_file --file=%sdk_url%
-7z x ./%zip_name% -y
-dir
-rmdir /S /Q Agora_Native_SDK_for_Windows_FULL\demo
-del /F /Q Agora_Native_SDK_for_Windows_FULL\commits
-del /F /Q Agora_Native_SDK_for_Windows_FULL\package_size_report.txt
-:SKIP_DOWNLOAD
+REM Check compress_apiexample parameter
+if "%compress_apiexample%"=="" set compress_apiexample=false
+echo compress_apiexample: %compress_apiexample%
 
+REM Check compile_project parameter
+if "%compile_project%"=="" set compile_project=false
+echo compile_project: %compile_project%
 
-mkdir Agora_Native_SDK_for_Windows_FULL\samples
-mkdir Agora_Native_SDK_for_Windows_FULL\samples\API-example
-rmdir /S /Q windows\cicd
-del /F /Q windows\APIExample\ci.py
-xcopy /Y /E windows\APIExample Agora_Native_SDK_for_Windows_FULL\samples\API-example
-xcopy /Y /E windows\README.md Agora_Native_SDK_for_Windows_FULL\samples\API-example
-xcopy /Y /E windows\README.zh.md Agora_Native_SDK_for_Windows_FULL\samples\API-example
-rmdir /S /Q Agora_Native_SDK_for_Windows_FULL\samples\API-example\APIExample\APIExample
-dir Agora_Native_SDK_for_Windows_FULL\samples\API-example\APIExample
-7z a -tzip result.zip -r Agora_Native_SDK_for_Windows_FULL
-copy result.zip %WORKSPACE%\\withAPIExample_%BUILD_NUMBER%_%zip_name%
-del /F result.zip
-del /F %WORKSPACE%\\%zip_name%
+REM Package APIExample code (only when compress_apiexample=true)
+REM Run before compile so package content is not affected by compile
+set result_zip=APIExample_result.zip
+set des_path=%WORKSPACE%\Shengwang_APIExample_code_windows_%BUILD_NUMBER%.zip
+if "%compress_apiexample%"=="true" (
+    echo "Packaging APIExample code..."
+    
+    REM Compress windows\APIExample (code only) to zip
+    echo "Compressing APIExample code package..."
+    del /F /Q %result_zip% 2>nul
+    7z a -tzip %result_zip% -r windows\APIExample
+    if errorlevel 1 (
+        echo 7z compression failed!
+        exit /b 1
+    )
+    
+    REM Copy to WORKSPACE with new naming format
+    echo "Copying %result_zip% to %des_path%"
+    copy %result_zip% %des_path%
+    if errorlevel 1 (
+        echo copy failed!
+        exit /b 1
+    )
+    
+    REM Clean up temporary zip in repo root
+    del /F %result_zip%
+    
+    echo "Complete: APIExample code package created"
+    dir %WORKSPACE%\
+) else (
+    echo "Skipping APIExample code packaging (compress_apiexample=false)"
+)
 
-if %compile_project% EQU false goto FINAL
-cd Agora_Native_SDK_for_Windows_FULL\samples\API-example
-call cloud_build.bat
-:FINAL
+REM Compile project to generate executable (only when compile_project=true)
+if "%compile_project%"=="true" (
+    echo "Compiling project to generate executable..."
+    cd windows\APIExample
+    call cloud_build.bat
+    if %ERRORLEVEL% NEQ 0 (
+        echo Build failed!
+        exit /b %ERRORLEVEL%
+    )
+    cd ..\..
+) else (
+    echo "Skipping project compilation (compile_project=false)"
+)

windows/APIExample/ci.py

@@ -1,10 +1,81 @@
+@echo off
+setlocal enabledelayedexpansion
+
 echo "compile start..."
-call installThirdParty.bat
-"C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe" "APIExample.sln" /p:platform="Win32" /p:configuration="Release"
-7z a -tzip result.zip -r Release
 
+REM --- 1. Install Dependencies ---
+powershell.exe -ExecutionPolicy Bypass -File "%~dp0install.ps1"
+
+REM --- 2. Find MSBuild ---
+set "MSBuildPath="
+set "vswhere=%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe"
+
+if exist "!vswhere!" (
+    for /f "usebackq tokens=*" %%i in (`"!vswhere!" -latest -requires Microsoft.Component.MSBuild -find MSBuild\**\Bin\MSBuild.exe`) do set "MSBuildPath=%%i"
+)
+
+if not defined MSBuildPath (
+    for %%p in (
+        "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\MSBuild.exe"
+        "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\MSBuild.exe"
+        "C:\Program Files\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe"
+    ) do if exist %%p set "MSBuildPath=%%p"
+)
+
+if not defined MSBuildPath (
+    echo Error: MSBuild not found.
+    exit /b 1
+)
+
+echo Using MSBuild at: "!MSBuildPath!"
+
+REM --- 3. Build ---
+"!MSBuildPath!" "APIExample.sln" /p:platform="Win32" /p:configuration="Release"
+if %ERRORLEVEL% NEQ 0 (
+    echo Build failed!
+    exit /b %ERRORLEVEL%
+)
+
+echo "compile done."
+
+REM --- 4. Package (Clean Output) ---
+echo Preparing clean output directory...
+rmdir /S /Q Output 2>nul
+mkdir Output
+
+REM Copy executables and DLLs from Release
+xcopy /Y /S Release\*.exe Output\ >nul 2>&1
+xcopy /Y /S Release\*.dll Output\ >nul 2>&1
+
+REM Copy resources
+xcopy /Y /S /I APIExample\res Output\res >nul 2>&1
+xcopy /Y APIExample\*.ini Output\ >nul 2>&1
+
+REM Copy SDK and ThirdParty DLLs (Agora uses sdk\x86 for Win32)
+xcopy /Y sdk\x86\*.dll Output\ >nul 2>&1
+xcopy /Y ThirdParty\libFFmpeg\*.dll Output\ >nul 2>&1
+
+echo Packaging...
+set "result_zip=result.zip"
+del /F /Q !result_zip! 2>nul
+
+REM Try 7z, fallback to PowerShell
+where 7z >nul 2>nul
+if %ERRORLEVEL% EQU 0 (
+    7z a -tzip !result_zip! .\Output\* >nul
+) else (
+    "C:\Program Files\7-Zip\7z.exe" a -tzip !result_zip! .\Output\* >nul 2>nul
+    if %ERRORLEVEL% NEQ 0 (
+        powershell -command "Compress-Archive -Path '.\Output\*' -DestinationPath '!result_zip!' -Force"
+    )
+)
+
+REM Copy to WORKSPACE with original naming format
 set h=%time:~0,2%
 set h=%h: =0%
-copy result.zip %WORKSPACE%\\APIExample_windows_%BUILD_NUMBER%_%date:~4,2%%date:~7,2%%h%%time:~3,2%_Release_exe.zip
-del /F result.zip
-echo "compile done."
+if not defined WORKSPACE set WORKSPACE=%~dp0
+copy !result_zip! "%WORKSPACE%\\APIExample_windows_%BUILD_NUMBER%_%date:~4,2%%date:~7,2%%h%%time:~3,2%_Release_exe.zip"
+del /F /Q !result_zip! 2>nul
+rmdir /S /Q Output 2>nul
+
+echo Build and Package done.

windows/APIExample/cloud_build.bat

@@ -7,41 +7,72 @@ $agora_local_sdk = '../../sdk'
 if (-not (Test-Path ThirdParty)){
 	echo "download $ThirdPartydes"
 	mkdir ThirdParty
-	(New-Object System.Net.WebClient).DownloadFile($ThirdPartySrc,$ThirdPartyDes)
-	Unblock-File $ThirdPartyDes
-	Expand-Archive -Path $ThirdPartyDes -DestinationPath 'ThirdParty' -Force 
-	Remove-Item $ThirdPartyDes -Recurse
+	(New-Object System.Net.WebClient).DownloadFile($ThirdPartysrc,$ThirdPartydes)
+	Unblock-File $ThirdPartydes
+	Expand-Archive -Path $ThirdPartydes -DestinationPath 'ThirdParty' -Force 
+	Remove-Item $ThirdPartydes -Recurse
 }
 
-
-
 if (-not (Test-Path sdk)){
     if (Test-Path $agora_local_sdk){
 	    mkdir sdk
-        mkdir sdk\x86
+	    mkdir sdk\x86
 	    mkdir sdk\x64
 	    mkdir sdk\high_level_api
 	    mkdir sdk\high_level_api\include
-	    Copy-Item $agora_local_sdk\x86\*     sdk\x86 -Recurse
+	    Copy-Item $agora_local_sdk\x86\*  sdk\x86 -Recurse
 	    Copy-Item $agora_local_sdk\x86_64\*  sdk\x64 -Recurse
 	    Copy-Item $agora_local_sdk\high_level_api\include\*  sdk\high_level_api\include -Recurse
     }else{
         echo "download $agora_des"
+		echo "Downloading SDK from: $agora_sdk"
+
 	    mkdir sdk
-        mkdir sdk\x86
+	    mkdir sdk\x86
 	    mkdir sdk\x64
 	    mkdir sdk\high_level_api
 	    mkdir sdk\high_level_api\include
-	    (New-Object System.Net.WebClient).DownloadFile($agora_sdk,$agora_des)
-	    Unblock-File $agora_des
-	    Expand-Archive -Path $agora_des -DestinationPath . -Force 
-	    Move-Item Agora_Native_SDK_for_Windows_FULL\sdk\x86\*        sdk\x86
-	    Move-Item Agora_Native_SDK_for_Windows_FULL\sdk\x86_64\*     sdk\x64
-	    Move-Item Agora_Native_SDK_for_Windows_FULL\sdk\high_level_api\include\*  sdk\high_level_api\include
-	    Remove-Item  $agora_des -Recurse -Force
-	    Remove-Item  Agora_Native_SDK_for_Windows_FULL -Recurse -Force
+	    
+	    # Use system temporary directory for extraction to avoid path length issues
+	    $tempBasePath = [System.IO.Path]::GetTempPath()
+	    $tempExtractPath = Join-Path $tempBasePath "RtcSdkExtract_$(Get-Random)"
+	    $tempZipPath = Join-Path $tempBasePath $agora_des
+	    
+	    try {
+	        (New-Object System.Net.WebClient).DownloadFile($agora_sdk, $tempZipPath)
+	        Unblock-File $tempZipPath
+	        Expand-Archive -Path $tempZipPath -DestinationPath $tempExtractPath -Force
+	        
+	        $extractedSdkPath = (Get-ChildItem -Path $tempExtractPath -Directory | Select-Object -First 1).FullName
+	        Move-Item (Join-Path $extractedSdkPath "sdk\x86\*") sdk\x86 -Force
+	        Move-Item (Join-Path $extractedSdkPath "sdk\x86_64\*") sdk\x64 -Force
+	        Move-Item (Join-Path $extractedSdkPath "sdk\high_level_api\include\*") sdk\high_level_api\include -Force
+	    }
+	    finally {
+	        # Clean up temporary files
+	        if (Test-Path $tempZipPath) { Remove-Item $tempZipPath -Force -ErrorAction SilentlyContinue }
+	        if (Test-Path $tempExtractPath) { Remove-Item $tempExtractPath -Recurse -Force -ErrorAction SilentlyContinue }
+	    }
     }
 }
 
-
-
+# Validation: check each folder has at least one direct child (non-empty), output to console only
+$allOk = $true
+foreach ($dir in @("ThirdParty", "sdk\x86", "sdk\x64", "sdk\high_level_api\include")) {
+    $p = Join-Path $PSScriptRoot $dir
+    $n = 0
+    if (Test-Path $p -PathType Container) {
+        try { $n = (Get-ChildItem $p -ErrorAction SilentlyContinue).Count } catch { Write-Host "[FAIL] $dir | $_" -ForegroundColor Red; $allOk = $false; continue }
+    }
+    $ok = $n -ge 1
+    if (-not $ok) { $allOk = $false }
+    if ($ok) { Write-Host "[PASS] $dir (items=$n)" } else { Write-Host "[FAIL] $dir (items=$n)" }
+}
+if ($allOk) {
+    Write-Host "Result: All passed."
+    Write-Host "Dependencies are installed; you can proceed to the next step." -ForegroundColor Green
+} else {
+    Write-Host "Result: Validation failed." -ForegroundColor Red
+    Write-Host "Please check network and download, ensure ThirdParty and sdk are not empty, then retry." -ForegroundColor Red
+    exit 1
+}

windows/APIExample/install.ps1

@@ -1,4 +1,6 @@
 cd /d %~dp0
 
-powershell.exe -command ^
-  "& {set-executionpolicy Remotesigned -Scope Process; ./'install.ps1'}"
+powershell.exe -Command "Unblock-File -Path '%~dp0install.ps1'"
+powershell.exe -File "%~dp0install.ps1"
+
+pause

windows/APIExample/installThirdParty.bat

@@ -36,6 +36,8 @@ To build and run the sample application, get an App ID:
 
 You can directly run `APIExample/installThirdParty.bat` to automatically environment configuration.Once the configuration is complete, open the project with VS2017, select the x86 version to compile and run.
 
+> If you run into permission or execution policy errors, try running as administrator, or adjust the local PowerShell execution policy and try again.
+
 ## Basic Scene
 
 

windows/README.md

@@ -40,7 +40,9 @@
 ### 编译项目
 **这个开源示例项目使用了Agora RTC SDK,DirectShow SDK,MeidaPlayer SDK。**
 
-你可以通过直接运行`APIExample/installThirdParty.bat`来自动进行依赖下载与环境配置。配置完成后使用vs2017打开项目，选择x86版本进行编译就可以运行了。 
+你可以通过直接运行`APIExample/installThirdParty.bat`来自动进行依赖下载与环境配置。配置完成后使用vs2017打开项目，选择x86版本进行编译就可以运行了。
+
+> 若遇权限或执行策略报错，可尝试以管理员运行，或调整本机 PowerShell 执行策略后再试。
 
 ## 基础场景
 

windows/README.zh.md

@@ -30,10 +30,6 @@ jobs:
     steps:
       - script: echo "$(WindowsRTCSDK)" && ls
       - script: cd ${{ parameters.workingDirectory }} && installThirdParty.bat
-      - script: cd ${{ parameters.workingDirectory }} && ls && python ci.py
-        env:
-          AGORA_APP_ID: $(agora.appId)
-          
       - task: VSBuild@1
         inputs:
           solution: '$(solution)'